diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 10:00:17 -0600 |
| commit | 955e20356d63ed405198c8143617a8a0ca8bfc02 (patch) | |
| tree | 9a9ab22c86d212a5655014ad752e96b04c0c86a9 | |
| parent | bf280726d5d22f33d33e4f9e771220c725249407 (diff) | |
| download | tdeutils-955e20356d63ed405198c8143617a8a0ca8bfc02.tar.gz tdeutils-955e20356d63ed405198c8143617a8a0ca8bfc02.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit bf280726d5d22f33d33e4f9e771220c725249407.
357 files changed, 2161 insertions, 2161 deletions
diff --git a/ark/ace.cpp b/ark/ace.cpp index 6ad5cd0..4ce0709 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::fromLatin1( buffer, buflen ); + TQString myBuf = TQString::tqfromLatin1( buffer, buflen ); kdDebug(1601) << " Wololo!: " << myBuf << endl; } diff --git a/ark/addition.ui b/ark/addition.ui index 401c146..ac12593 100644 --- a/ark/addition.ui +++ b/ark/addition.ui @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>51</height> diff --git a/ark/arch.cpp b/ark/arch.cpp index ee2a23e..5ff9a61 100644 --- a/ark/arch.cpp +++ b/ark/arch.cpp @@ -365,13 +365,13 @@ bool Arch::processLine( const TQCString &line ) : columns[ m_fixYear ]; TQString month = ( m_repairMonth >= 0 ) ? TQString( "%1" ) - .arg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) ) + .tqarg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) ) : columns[ m_fixMonth ]; - TQString timestamp = TQString::fromLatin1( "%1-%2-%3 %4" ) - .arg( year ) - .arg( month ) - .arg( columns[ m_fixDay ] ) - .arg( columns[ m_fixTime ] ); + TQString timestamp = TQString::tqfromLatin1( "%1-%2-%3 %4" ) + .tqarg( year ) + .tqarg( month ) + .tqarg( columns[ m_fixDay ] ) + .tqarg( columns[ m_fixTime ] ); columns[ m_dateCol ] = timestamp; } diff --git a/ark/archiveformatdlg.cpp b/ark/archiveformatdlg.cpp index 5ac942c..18f4102 100644 --- a/ark/archiveformatdlg.cpp +++ b/ark/archiveformatdlg.cpp @@ -40,12 +40,12 @@ ArchiveFormatDlg::ArchiveFormatDlg( TQWidget * parent, const TQString & defaultT text = i18n( "This file appears to be of type %1,\n" "which is not a supported archive format.\n" "In order to proceed, please choose the format\n" - "of the file." ).arg( defaultType ); + "of the file." ).tqarg( defaultType ); else text = i18n( "You are about to open a file that has a non-standard extension.\n" "Ark has detected the format: %1\n" "If this is not correct, please choose " - "the appropriate format." ).arg( defaultDescription ); + "the appropriate format." ).tqarg( defaultDescription ); TQVBox * page = makeVBoxMainWidget(); diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index f52d763..20ac169 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -294,7 +294,7 @@ bool ArkPart::closeURL() int res = KMessageBox::warningYesNoCancel( widget(), i18n( "The archive \"%1\" has been modified.\n" - "Do you want to save it?" ).arg( docName ), + "Do you want to save it?" ).tqarg( docName ), i18n( "Save Archive?" ), KStdGuiItem::save(), KStdGuiItem::discard() ); switch ( res ) @@ -320,7 +320,7 @@ void ArkPart::transferStarted( KIO::Job *job ) { m_job = job; - m_bar->slotSetBusy( i18n( "Downloading %1..." ).arg( m_url.prettyURL() ), + m_bar->slotSetBusy( i18n( "Downloading %1..." ).tqarg( m_url.prettyURL() ), (job != 0), (job != 0) ); if ( job ) @@ -411,12 +411,12 @@ void ArkStatusBarExtension::setupStatusBar() m_pStatusLabelTotal = new KSqueezedTextLabel( statusBar(), "StatusLabelTotal" ); m_pStatusLabelTotal->setFrameStyle( TQFrame::NoFrame ); - m_pStatusLabelTotal->setAlignment( AlignRight ); + m_pStatusLabelTotal->tqsetAlignment( AlignRight ); m_pStatusLabelTotal->setText( i18n( "Total: 0 files" ) ); m_pStatusLabelSelect = new TQLabel( statusBar(), "StatusLabelSelect" ); m_pStatusLabelSelect->setFrameStyle( TQFrame::NoFrame ); - m_pStatusLabelSelect->setAlignment( AlignLeft ); + m_pStatusLabelSelect->tqsetAlignment( 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->setAlignment( AlignLeft ); + m_pBusyText->tqsetAlignment( AlignLeft ); m_pBusyText->setFrameStyle( TQFrame::Panel | TQFrame::Raised ); } diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp index 13db475..b2ae335 100644 --- a/ark/arkviewer.cpp +++ b/ark/arkviewer.cpp @@ -30,7 +30,7 @@ #include <kiconloader.h> #include <tqvbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqframe.h> #include <tqurl.h> @@ -40,7 +40,7 @@ ArkViewer::ArkViewer( TQWidget * parent, const char * name ) : KDialogBase( parent, name, false, TQString(), Close ), m_part( 0 ) { m_widget = new TQVBox( this ); - m_widget->layout()->setSpacing( 10 ); + m_widget->tqlayout()->setSpacing( 10 ); connect( this, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFinished() ) ); @@ -76,15 +76,15 @@ bool ArkViewer::view( const KURL& filename ) TQLabel *iconLabel = new TQLabel( header ); iconLabel->setPixmap( mimetype->pixmap( KIcon::Desktop ) ); - iconLabel->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); + iconLabel->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); TQVBox *headerRight = new TQVBox( header ); new TQLabel( TQString( "<qt><b>%1</b></qt>" ) - .arg( filename.fileName() ), headerRight + .tqarg( filename.fileName() ), headerRight ); new TQLabel( mimetype->comment(), headerRight ); - header->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum ); + header->tqsetSizePolicy( 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 62a3cea..a83cb14 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -33,7 +33,7 @@ #include <sys/stat.h> // TQt includes -#include <layout.h> +#include <tqlayout.h> #include <tqstringlist.h> #include <tqlabel.h> #include <tqcheckbox.h> @@ -199,7 +199,7 @@ ArkWidget::updateStatusTotals() m_nSizeOfFiles = m_fileListView->totalSize(); TQString strInfo = i18n( "%n file %1", "%n files %1", m_nNumFiles ) - .arg( KIO::convertSize( m_nSizeOfFiles ) ); + .tqarg( KIO::convertSize( m_nSizeOfFiles ) ); emit setStatusBarText(strInfo); } @@ -354,7 +354,7 @@ ArkWidget::convertSlotCreateDone( bool success ) // addFile( const TQString & baseDir, // // const TQStringList & filesToAdd ) // ////////////////////////////////////////////////////// - *it = TQString::fromLatin1( "file:" )+ m_convert_tmpDir->name() + *it; + *it = TQString::tqfromLatin1( "file:" )+ m_convert_tmpDir->name() + *it; } bool bOldRecVal = ArkSettings::rarRecurseSubdirs(); connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( convertSlotAddDone( bool ) ) ); @@ -431,7 +431,7 @@ ArkWidget::extractTo( const KURL & targetDirectory, const KURL & archive, bool b { if ( !KIO::NetAccess::mkdir( m_extractTo_targetDirectory, this ) ) { - KMessageBox::error( 0, i18n( "Could not create the folder %1" ).arg( + KMessageBox::error( 0, i18n( "Could not create the folder %1" ).tqarg( targetDirectory.prettyURL() ) ); emit request_file_quit(); return; @@ -467,7 +467,7 @@ ArkWidget::extractToSlotOpenDone( bool success ) disconnect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( extractToSlotOpenDone( bool ) ) ); if ( !success ) { - KMessageBox::error( this, i18n( "An error occurred while opening the archive %1." ).arg( m_url.prettyURL() ) ); + KMessageBox::error( this, i18n( "An error occurred while opening the archive %1." ).tqarg( m_url.prettyURL() ) ); emit request_file_quit(); return; } @@ -712,7 +712,7 @@ ArkWidget::file_open(const KURL& url) TQFileInfo fileInfo( strFile ); if ( !fileInfo.exists() ) { - KMessageBox::error(this, i18n("The archive %1 does not exist.").arg(strFile)); + KMessageBox::error(this, i18n("The archive %1 does not exist.").tqarg(strFile)); emit removeRecentURL( m_realURL ); return; } @@ -821,7 +821,7 @@ ArkWidget::getCreateFilename(const TQString & _caption, { KMessageBox::error( this, i18n( "You do not have permission" - " to write to the directory %1" ).arg(url.directory() ) ); + " to write to the directory %1" ).tqarg(url.directory() ) ); return TQString(); } } // end of while loop @@ -1817,13 +1817,13 @@ ArkWidget::updateStatusSelection() else if (m_nNumSelectedFiles != 1) { strInfo = i18n("%1 files selected %2") - .arg(KGlobal::locale()->formatNumber(m_nNumSelectedFiles, 0)) - .arg(KIO::convertSize(m_nSizeOfSelectedFiles)); + .tqarg(KGlobal::locale()->formatNumber(m_nNumSelectedFiles, 0)) + .tqarg(KIO::convertSize(m_nSizeOfSelectedFiles)); } else { strInfo = i18n("1 file selected %2") - .arg(KIO::convertSize(m_nSizeOfSelectedFiles)); + .tqarg(KIO::convertSize(m_nSizeOfSelectedFiles)); } emit setStatusBarSelectedFiles(strInfo); @@ -2044,7 +2044,7 @@ Arch * ArkWidget::getNewArchive( const TQString & _fileName, const TQString& _mi if (!newArch->archUtilityIsAvailable()) { - KMessageBox::error(this, i18n("The utility %1 is not in your PATH.\nPlease install it or contact your system administrator.").arg(newArch->getArchUtility())); + KMessageBox::error(this, i18n("The utility %1 is not in your PATH.\nPlease install it or contact your system administrator.").tqarg(newArch->getArchUtility())); return NULL; } @@ -2156,7 +2156,7 @@ ArkWidget::openArchive( const TQString & _filename ) if (!newArch->unarchUtilityIsAvailable()) { - KMessageBox::error(this, i18n("The utility %1 is not in your PATH.\nPlease install it or contact your system administrator.").arg(newArch->getUnarchUtility())); + KMessageBox::error(this, i18n("The utility %1 is not in your PATH.\nPlease install it or contact your system administrator.").tqarg(newArch->getUnarchUtility())); return; } @@ -2211,7 +2211,7 @@ ArkWidget::slotOpen( Arch * /* _newarch */, bool _success, const TQString & _fil { emit removeRecentURL( m_realURL ); emit setWindowCaption( TQString() ); - KMessageBox::error( this, i18n( "An error occurred while trying to open the archive %1" ).arg( _filename ) ); + KMessageBox::error( this, i18n( "An error occurred while trying to open the archive %1" ).tqarg( _filename ) ); if ( m_extractOnly ) emit request_file_quit(); diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp index 862d357..f935eac 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::fromLatin1( "compressed_file_temp" ) ); + + TQString::tqfromLatin1( "compressed_file_temp" ) ); m_tempDirectory->setAutoDelete( true ); m_tmpdir = m_tempDirectory->name(); initData(); diff --git a/ark/extraction.ui b/ark/extraction.ui index 1ac60b8..b51ebee 100644 --- a/ark/extraction.ui +++ b/ark/extraction.ui @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp index e5568ab..923f108 100644 --- a/ark/extractiondialog.cpp +++ b/ark/extractiondialog.cpp @@ -34,7 +34,7 @@ #include <tqhbuttongroup.h> #include <tqlabel.h> #include <tqradiobutton.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <kglobal.h> @@ -63,24 +63,24 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name, { if ( !archiveName.isNull() ) { - setCaption( i18n( "Extract Files From %1" ).arg( archiveName ) ); + setCaption( i18n( "Extract Files From %1" ).tqarg( archiveName ) ); } TQVBox *vbox = makeVBoxMainWidget(); TQHBox *header = new TQHBox( vbox ); - header->layout()->setSpacing( 10 ); + header->tqlayout()->setSpacing( 10 ); TQLabel *icon = new TQLabel( header ); icon->setPixmap( DesktopIcon( "ark_extract" ) ); - icon->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); + icon->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); if ( enableSelected ) { TQVBox *whichFiles = new TQVBox( header ); - whichFiles->layout()->setSpacing( 6 ); + whichFiles->tqlayout()->setSpacing( 6 ); new TQLabel( TQString( "<qt><b><font size=\"+1\">%1</font></b></qt>" ) - .arg( i18n( "Extract:" ) ), whichFiles ); + .tqarg( i18n( "Extract:" ) ), whichFiles ); TQHButtonGroup *filesGroup = new TQHButtonGroup( whichFiles ); m_selectedButton = new TQRadioButton( i18n( "Selected files only" ), filesGroup ); m_allButton = new TQRadioButton( i18n( "All files" ), filesGroup ); @@ -90,13 +90,13 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name, else { new TQLabel( TQString( "<qt><b><font size=\"+2\">%1</font></b></qt>" ) - .arg( i18n( "Extract all files" ) ), header ); + .tqarg( i18n( "Extract all files" ) ), header ); } TQHBox *destDirBox = new TQHBox( vbox ); TQLabel *destFolderLabel = new TQLabel( i18n( "Destination folder: " ), destDirBox ); - destFolderLabel->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); + destFolderLabel->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + m_urlRequester->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); m_urlRequester->setMode( KFile::Directory ); if (!defaultExtractionDir.prettyURL().isEmpty() ) @@ -145,7 +145,7 @@ void ExtractionDialog::accept() TQFileInfo fi( p.path() ); if ( !fi.isDir() && !fi.exists() ) { - TQString ltext = i18n( "Create folder %1?").arg(p.path()); + TQString ltext = i18n( "Create folder %1?").tqarg(p.path()); int createDir = KMessageBox::questionYesNo( this, ltext, i18n( "Missing Folder" ) , i18n("Create Folder"), i18n("Do Not Create")); if( createDir == 4 ) { diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp index ca941bd..5aa1122 100644 --- a/ark/filelistview.cpp +++ b/ark/filelistview.cpp @@ -153,7 +153,7 @@ void FileLVI::setText( int column, const TQString &text ) else m_ratio = text.toDouble(); TQListViewItem::setText( column, i18n( "Packed Ratio", "%1 %" ) - .arg(KGlobal::locale()->formatNumber( m_ratio, 1 ) ) + .tqarg(KGlobal::locale()->formatNumber( m_ratio, 1 ) ) ); } else if ( colName == timeStampStrCol ) @@ -264,14 +264,14 @@ TQStringList FileListView::selectedFilenames() { if ( item->isSelected() ) { - // If the item has children, add each child and the item + // If the item has tqchildren, add each child and the item if ( item->childCount() > 0 ) { files += item->fileName(); - files += childrenOf( item ); + files += tqchildrenOf( item ); /* If we got here, then the logic for "going to the next item" - * is a bit different: as we already dealt with all the children, + * is a bit different: as we already dealt with all the tqchildren, * the "next item" is the next sibling of the current item, not * its first child. If the current item has no siblings, then * the next item is the next sibling of its parent, and so on. @@ -288,7 +288,7 @@ TQStringList FileListView::selectedFilenames() } else { - // If the item has no children, just add it to the list + // If the item has no tqchildren, just add it to the list files += item->fileName(); } } @@ -559,10 +559,10 @@ FileLVI* FileListView::findParent( const TQString& fullname ) return static_cast< FileLVI* >( item ); } -TQStringList FileListView::childrenOf( FileLVI* parent ) +TQStringList FileListView::tqchildrenOf( FileLVI* parent ) { Q_ASSERT( parent ); - TQStringList children; + TQStringList tqchildren; FileLVI *item = static_cast<FileLVI*>( parent->firstChild() ); @@ -570,17 +570,17 @@ TQStringList FileListView::childrenOf( FileLVI* parent ) { if ( item->childCount() == 0 ) { - children += item->fileName(); + tqchildren += item->fileName(); } else { - children += item->fileName(); - children += childrenOf( item ); + tqchildren += item->fileName(); + tqchildren += tqchildrenOf( item ); } item = static_cast<FileLVI*>( item->nextSibling() ); } - return children; + return tqchildren; } #include "filelistview.moc" diff --git a/ark/filelistview.h b/ark/filelistview.h index b670feb..7605e01 100644 --- a/ark/filelistview.h +++ b/ark/filelistview.h @@ -153,7 +153,7 @@ class FileListView: public KListView private: FileLVI* findParent( const TQString& fullname ); - TQStringList childrenOf( FileLVI* parent ); + TQStringList tqchildrenOf( FileLVI* parent ); TQMap<int, columnName> m_columnMap; bool m_pressed; diff --git a/ark/general.ui b/ark/general.ui index 5f50883..150e1e4 100644 --- a/ark/general.ui +++ b/ark/general.ui @@ -37,7 +37,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>15</width> <height>31</height> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>90</height> diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 09fdc0a..8541e1a 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -22,7 +22,7 @@ */ // QT includes -#include <layout.h> +#include <tqlayout.h> // KDE includes #include <kdebug.h> @@ -177,7 +177,7 @@ MainWindow::file_reload() void MainWindow::editToolbars() { - saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") ); + saveMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("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::fromLatin1("MainWindow") ); + applyMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") ); } void @@ -221,7 +221,7 @@ MainWindow::arkAlreadyOpen( const KURL & url ) window_close(); // notify the user what's going on - KMessageBox::information(0, i18n("The archive %1 is already open and has been raised.\nNote: if the filename does not match, it only means that one of the two is a symbolic link.").arg(url.prettyURL())); + KMessageBox::information(0, i18n("The archive %1 is already open and has been raised.\nNote: if the filename does not match, it only means that one of the two is a symbolic link.").tqarg(url.prettyURL())); return true; } return false; diff --git a/ark/rar.cpp b/ark/rar.cpp index f324f31..1cebe05 100644 --- a/ark/rar.cpp +++ b/ark/rar.cpp @@ -32,7 +32,7 @@ // QT includes #include <tqfile.h> #include <tqdir.h> -#include <textcodec.h> +#include <tqtextcodec.h> // KDE includes #include <kdebug.h> @@ -90,10 +90,10 @@ RarArch::RarArch( ArkWidget *_gui, const TQString & _fileName ) bool RarArch::processLine( const TQCString &line ) { - TQString unicode_line; + TQString tqunicode_line; TQTextCodec *codec = TQTextCodec::codecForLocale(); - unicode_line = codec->toUnicode( line ); + tqunicode_line = codec->toUnicode( line ); if ( m_isFirstLine ) { diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp index 216fb8d..0673f6c 100644 --- a/ark/sevenzip.cpp +++ b/ark/sevenzip.cpp @@ -283,13 +283,13 @@ bool SevenZipArch::processLine( const TQCString& _line ) : columns[ m_fixYear ]; TQString month = ( m_repairMonth >= 0 ) ? TQString( "%1" ) - .arg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) ) + .tqarg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) ) : columns[ m_fixMonth ]; - TQString timestamp = TQString::fromLatin1( "%1-%2-%3 %4" ) - .arg( year ) - .arg( month ) - .arg( columns[ m_fixDay ] ) - .arg( columns[ m_fixTime ] ); + TQString timestamp = TQString::tqfromLatin1( "%1-%2-%3 %4" ) + .tqarg( year ) + .tqarg( month ) + .tqarg( columns[ m_fixDay ] ) + .tqarg( columns[ m_fixTime ] ); columns[ m_dateCol ] = timestamp; } diff --git a/ark/tar.cpp b/ark/tar.cpp index 4cdb792..e91f5ca 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::fromLatin1( "temp_tar" ) ); + + TQString::tqfromLatin1( "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::fromLatin1(".tar") ); + TQString::tqfromLatin1(".tar") ); tmpfile = pTempFile->name(); delete pTempFile; @@ -322,14 +322,14 @@ void TarArch::slotListingDone(KProcess *_kp) if (flv!=NULL && flv->totalFiles()>0) { const TQString firstfile = ((FileLVI *) flv->firstChild())->fileName(); - if (list.find(TQRegExp(TQString("\\s\\./%1[/\\n]").arg(firstfile)))>=0) + if (list.find(TQRegExp(TQString("\\s\\./%1[/\\n]").tqarg(firstfile)))>=0) { m_dotslash = true; kdDebug(1601) << k_funcinfo << "archive has dot-slash" << endl; } else { - if (list.find(TQRegExp(TQString("\\s%1[/\\n]").arg(firstfile)))>=0) + if (list.find(TQRegExp(TQString("\\s%1[/\\n]").tqarg(firstfile)))>=0) { // archive doesn't have dot-slash m_dotslash = false; diff --git a/ark/tarlistingthread.h b/ark/tarlistingthread.h index 070b483..6dcdbe5 100644 --- a/ark/tarlistingthread.h +++ b/ark/tarlistingthread.h @@ -32,16 +32,16 @@ class KArchive; class ListingEvent: public TQCustomEvent { public: - enum Status { Normal, Error, ListingFinished }; - ListingEvent( const TQStringList& data, Status st = Normal ) + enum tqStatus { Normal, Error, ListingFinished }; + ListingEvent( const TQStringList& data, tqStatus st = Normal ) : TQCustomEvent( 65442 ), m_data( data ), m_status( st ) {} const TQStringList& columns() const { return m_data; } - Status status() const { return m_status; } + tqStatus status() const { return m_status; } private: TQStringList m_data; - Status m_status; + tqStatus m_status; }; class TarListingThread: public TQThread diff --git a/ark/zoo.cpp b/ark/zoo.cpp index 1ef7377..32b161b 100644 --- a/ark/zoo.cpp +++ b/ark/zoo.cpp @@ -289,7 +289,7 @@ TQString fixTime( const TQString &_strTime ) if ( strTime.contains("+") || strTime.contains("-") ) { - TQCharRef c = strTime.at( 8 ); + TQCharRef c = strTime.tqat( 8 ); int offset = strTime.right( strTime.length() - 9 ).toInt(); TQString strHour = strTime.left( 2 ); int nHour = strHour.toInt(); diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp index 9be73c4..4f41c90 100644 --- a/charselectapplet/charselectapplet.cpp +++ b/charselectapplet/charselectapplet.cpp @@ -23,9 +23,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <math.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqvbox.h> #include <tqspinbox.h> #include <tqlabel.h> @@ -66,7 +66,7 @@ CharSelectApplet::CharSelectApplet(const TQString& configFile, Type type, int ac cell_height = c->readNumEntry("CellHeight", cell_height); TQString characters = c->readEntry("Characters", "������ߩ��"); - // setup layout + // setup tqlayout TQHBoxLayout *_layout = new TQHBoxLayout(this); _layout->setAutoAdd(true); @@ -251,16 +251,16 @@ void CharTable::paintCell(TQPainter* p, int row, int col) // draw background if (active) { - p->setBrush(TQBrush(colorGroup().highlight())); + p->setBrush(TQBrush(tqcolorGroup().highlight())); p->setPen(NoPen); p->drawRect(0, 0, w, h); - p->setPen(colorGroup().highlightedText()); + p->setPen(tqcolorGroup().highlightedText()); } else { - p->setBrush(TQBrush(colorGroup().base())); + p->setBrush(TQBrush(tqcolorGroup().base())); p->setPen(NoPen); p->drawRect(0, 0, w, h); - p->setPen(colorGroup().text()); + p->setPen(tqcolorGroup().text()); } // set font @@ -310,7 +310,7 @@ void CharTable::selectCell(int row, int col) repaintCell(oldRow, oldCol); repaintCell(_activeRow, _activeCol); - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); TQObject::disconnect( cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) ); TQString text = TQString(_map[col + row * _cols]); bool oldMode = cb->selectionModeEnabled(); @@ -332,7 +332,7 @@ void CharTable::clearCell() repaintCell(oldRow, oldCol); - TQObject::disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) ); + TQObject::disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) ); } diff --git a/kcalc/colors.ui b/kcalc/colors.ui index af64057..6aae3bc 100644 --- a/kcalc/colors.ui +++ b/kcalc/colors.ui @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>20</height> @@ -179,7 +179,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -255,7 +255,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kcalc/constants.ui b/kcalc/constants.ui index 8bebd01..efe888c 100644 --- a/kcalc/constants.ui +++ b/kcalc/constants.ui @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>21</height> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>21</height> @@ -130,7 +130,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>21</height> @@ -155,7 +155,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>21</height> @@ -201,7 +201,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>21</height> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>21</height> @@ -272,7 +272,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>21</height> @@ -297,7 +297,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>21</height> @@ -343,7 +343,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>21</height> @@ -368,7 +368,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>21</height> @@ -414,7 +414,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>21</height> @@ -439,7 +439,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>21</height> @@ -468,7 +468,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kcalc/general.ui b/kcalc/general.ui index bd04b29..3b922b8 100644 --- a/kcalc/general.ui +++ b/kcalc/general.ui @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>20</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index d03ac31..34f4fb3 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -31,7 +31,7 @@ #include <tqbuttongroup.h> #include <tqfont.h> #include <tqhbuttongroup.h> -#include <layout.h> +#include <tqlayout.h> #include <tqobjectlist.h> #include <tqradiobutton.h> #include <tqspinbox.h> @@ -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->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false); + BaseChooseGroup->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false); pbBaseChoose[0] = new TQRadioButton(i18n("He&x"), BaseChooseGroup, @@ -246,14 +246,14 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) mainLayout->addLayout(topLayout); mainLayout->addLayout(btnLayout); - // button layout + // button tqlayout btnLayout->addWidget(mSmallPage, 0, AlignTop); btnLayout->addSpacing(2*mInternalSpacing); btnLayout->addWidget(mNumericPage, 0, AlignTop); btnLayout->addSpacing(2*mInternalSpacing); btnLayout->addWidget(mLargePage, 0, AlignTop); - // small button layout + // small button tqlayout smallBtnLayout->addWidget(pbStat["NumData"], 0, 0); smallBtnLayout->addWidget(pbScientific["HypMode"], 0, 1); smallBtnLayout->addWidget(pbLogic["AND"], 0, 2); @@ -303,7 +303,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) smallBtnLayout->setRowStretch(4, 0); smallBtnLayout->setRowStretch(5, 0); - // large button layout + // large button tqlayout largeBtnLayout->addWidget(pbClear, 0, 0); largeBtnLayout->addWidget(pbAC, 0, 1); @@ -319,7 +319,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) largeBtnLayout->addWidget(pbPercent, 4, 0); largeBtnLayout->addWidget(pbPlusMinus, 4, 1); - // top layout + // top tqlayout topLayout->addWidget(pbAngleChoose); topLayout->addWidget(BaseChooseGroup); topLayout->addStretch(); @@ -381,7 +381,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) updateGeometry(); adjustSize(); - setFixedSize(sizeHint()); + setFixedSize(tqsizeHint()); UpdateDisplay(true); @@ -457,7 +457,7 @@ actionCollection()); void KCalculator::setupStatusbar(void) { - // Status bar contents + // tqStatus bar contents statusBar()->insertFixedItem(" NORM ", 0, true); statusBar()->setItemAlignment(0, AlignCenter); @@ -608,7 +608,7 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent) TQGridLayout *thisLayout = new TQGridLayout(thisPage, 5, 4, 0, mInternalSpacing); - // large button layout + // large button tqlayout thisLayout->addWidget(pbEE, 0, 0); thisLayout->addWidget(pbDivision, 0, 1); thisLayout->addWidget(pbX, 0, 2); @@ -1050,7 +1050,7 @@ void KCalculator::updateGeometry(void) { TQWidget *tmp_widget = dynamic_cast<TQWidget *>(o); margin = TQApplication::tqstyle(). - pixelMetric(TQStyle::PM_ButtonMargin, (tmp_widget))*2; + tqpixelMetric(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))->minimumSize().height(); + int h1 = (NumButtonGroup->find(0x0F))->tqminimumSize().height(); int h2 = static_cast<int>( (static_cast<float>(h1) + 4.0) / 5.0 ); s.setWidth(mLargePage->fontMetrics().width("MMM") + TQApplication::tqstyle(). - pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2); + tqpixelMetric(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))->minimumSize().height(); + h1 = (NumButtonGroup->find(0x0F))->tqminimumSize().height(); h2 = (int)((((float)h1 + 4.0) / 5.0)); s.setWidth(mLargePage->fontMetrics().width("MMM") + TQApplication::tqstyle(). - pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2); + tqpixelMetric(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(sizeHint()); + setFixedSize(tqsizeHint()); KCalcSettings::setShowStat(toggled); } @@ -1985,7 +1985,7 @@ void KCalculator::slotScientificshow(bool toggled) calc_display->setStatusText(2, TQString()); } adjustSize(); - setFixedSize(sizeHint()); + setFixedSize(tqsizeHint()); KCalcSettings::setShowScientific(toggled); } @@ -2026,7 +2026,7 @@ void KCalculator::slotLogicshow(bool toggled) (NumButtonGroup->find(i))->hide(); } adjustSize(); - setFixedSize(sizeHint()); + setFixedSize(tqsizeHint()); KCalcSettings::setShowLogic(toggled); } @@ -2052,7 +2052,7 @@ void KCalculator::slotConstantsShow(bool toggled) pbConstant[5]->hide(); } adjustSize(); - setFixedSize(sizeHint()); + setFixedSize(tqsizeHint()); KCalcSettings::setShowConstants(toggled); } @@ -2108,7 +2108,7 @@ void KCalculator::updateSettings() calc_display->changeSettings(); updateGeometry(); - resize(minimumSize()); + resize(tqminimumSize()); // // 1999-10-31 Espen Sand: Don't ask me why ;) @@ -2139,7 +2139,7 @@ void KCalculator::set_colors() calc_display->changeSettings(); - TQColor bg = palette().active().background(); + TQColor bg = tqpalette().active().background(); TQPalette numPal(KCalcSettings::numberButtonsColor(), bg); for(int i=0; i<10; i++) @@ -2212,7 +2212,7 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e) if((num_but = NumButtonGroup->id((KCalcButton*)o)) != -1) { - TQPalette pal(c, palette().active().background()); + TQPalette pal(c, tqpalette().active().background()); // Was it hex-button or normal digit?? if (num_but <10) @@ -2243,7 +2243,7 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e) else return false; - TQPalette pal(c, palette().active().background()); + TQPalette pal(c, tqpalette().active().background()); for(KCalcButton *p = list->first(); p; p=list->next()) p->setPalette(pal); diff --git a/kcalc/kcalc.kcfg b/kcalc/kcalc.kcfg index 26cdbf1..b54de8f 100644 --- a/kcalc/kcalc.kcfg +++ b/kcalc/kcalc.kcfg @@ -18,7 +18,7 @@ </entry> <entry name="NumberButtonsColor" type="Color"> <label>The color of number buttons.</label> - <code>QColor defaultButtonColor = kapp->palette().active().background();</code> + <code>QColor defaultButtonColor = kapp->tqpalette().active().background();</code> <default code="true">defaultButtonColor</default> </entry> <entry name="FunctionButtonsColor" type="Color"> diff --git a/kcalc/kcalc_button.cpp b/kcalc/kcalc_button.cpp index dd62821..277e5bd 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, childrenRegion(), colorGroup()); + _text.draw(paint, width()/2-_text.width()/2, 0, tqchildrenRegion(), tqcolorGroup()); } else { KPushButton::drawButtonLabel(paint); } diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp index b711256..83e0924 100644 --- a/kcalc/kcalcdisplay.cpp +++ b/kcalc/kcalcdisplay.cpp @@ -27,7 +27,7 @@ #include <stdlib.h> #include <ctype.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqpainter.h> #include <tqregexp.h> @@ -46,10 +46,10 @@ KCalcDisplay::KCalcDisplay(TQWidget *parent, const char *name) selection_timer(new TQTimer) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); - setAlignment(AlignRight | AlignVCenter); + tqsetAlignment(AlignRight | AlignVCenter); setFocus(); setFocusPolicy(TQ_StrongFocus); - setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false); connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisplaySelected())); @@ -105,13 +105,13 @@ void KCalcDisplay::slotCopy(void) TQString txt = TQLabel::text(); if (_num_base == NB_HEX) txt.prepend( "0x" ); - (TQApplication::clipboard())->setText(txt, TQClipboard::Clipboard); - (TQApplication::clipboard())->setText(txt, TQClipboard::Selection); + (TQApplication::tqclipboard())->setText(txt, TQClipboard::Clipboard); + (TQApplication::tqclipboard())->setText(txt, TQClipboard::Selection); } void KCalcDisplay::slotPaste(bool bClipboard) { - TQString tmp_str = (TQApplication::clipboard())->text(bClipboard ? TQClipboard::Clipboard : TQClipboard::Selection); + TQString tmp_str = (TQApplication::tqclipboard())->text(bClipboard ? TQClipboard::Clipboard : TQClipboard::Selection); if (tmp_str.isNull()) { @@ -123,7 +123,7 @@ void KCalcDisplay::slotPaste(bool bClipboard) tmp_str = tmp_str.stripWhiteSpace(); - if (tmp_str.startsWith("0x", false)) + if (tmp_str.tqstartsWith("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::sizeHint() const +TQSize KCalcDisplay::tqsizeHint() const { TQFont f(font()); f.setPointSize(TQMAX((f.pointSize() / 2), 7)); TQFontMetrics fm(f); - return TQLabel::sizeHint() + TQSize(0, fm.height()); + return TQLabel::tqsizeHint() + TQSize(0, fm.height()); } diff --git a/kcalc/kcalcdisplay.h b/kcalc/kcalcdisplay.h index 338e721..d12ba2f 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 sizeHint() const; + virtual TQSize tqsizeHint() const; private: bool _beep; bool _groupdigits; diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc index cafdab3..1e2f23d 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->sizeHint()); + charSelect->resize(charSelect->tqsizeHint()); 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->sizeHint()); + lined->resize(lined->tqsizeHint()); 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->sizeHint() ); + bHelp->setFixedSize( bHelp->tqsizeHint() ); 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->sizeHint() ); + bClear->setFixedSize( bClear->tqsizeHint() ); grid->addWidget( bClear, 2, 2 ); bClip = new KPushButton( KGuiItem( i18n( "&To Clipboard" ), "editcopy" ), mainWidget ); - bClip->setFixedSize( bClip->sizeHint() ); + bClip->setFixedSize( bClip->tqsizeHint() ); connect(bClip,TQT_SIGNAL(clicked()),this,TQT_SLOT(toClip())); grid->addWidget( bClip, 2, 3 ); @@ -98,15 +98,15 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name, (void)new KAction(i18n("&Flip"), 0, TQT_TQOBJECT(this), TQT_SLOT(flipText()), actionCollection(), "flip" ); (void)new KAction(i18n("&Alignment"), 0, TQT_TQOBJECT(this), - TQT_SLOT(toggleEntryDirection()), actionCollection(), "alignment" ); + TQT_SLOT(toggleEntryDirection()), actionCollection(), "tqalignment" ); charSelect->setFocus(); entryDirection = direction; if( entryDirection ) - lined->setAlignment( TQt::AlignRight ); + lined->tqsetAlignment( TQt::AlignRight ); else - lined->setAlignment( TQt::AlignLeft ); + lined->tqsetAlignment( TQt::AlignLeft ); setupGUI(Keys|StatusBar|Save|Create); } @@ -148,7 +148,7 @@ void KCharSelectDia::add(const TQChar &_chr) //================================================================== void KCharSelectDia::toClip() { - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setSelectionMode( true ); cb->setText(lined->text()); cb->setSelectionMode( false ); @@ -161,7 +161,7 @@ void KCharSelectDia::toClip() // void KCharSelectDia::toClipUTF8() { - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); TQString str = lined->text(); cb->setText(str.utf8()); } @@ -174,7 +174,7 @@ void KCharSelectDia::toClipUTF8() // void KCharSelectDia::toClipHTML() { - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); TQString input; TQString html; TQString tempstring; @@ -185,13 +185,13 @@ void KCharSelectDia::toClipHTML() for(i=0; i< input.length(); i++ ) { tempchar = input.at(i); - if( tempchar.latin1() && ((tempchar.unicode() < 128) || (tempchar.unicode() >= 128+32)) ) + if( tempchar.latin1() && ((tempchar.tqunicode() < 128) || (tempchar.tqunicode() >= 128+32)) ) { html.append(input.at(i)); } else { - html.append(tempstring.sprintf("&#x%x;", tempchar.unicode())); + html.append(tempstring.sprintf("&#x%x;", tempchar.tqunicode())); } } cb->setText(html); @@ -201,7 +201,7 @@ void KCharSelectDia::toClipHTML() // void KCharSelectDia::fromClip() { - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); lined->setText( cb->text() ); } @@ -213,7 +213,7 @@ void KCharSelectDia::fromClip() // void KCharSelectDia::fromClipUTF8() { - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); TQString str = cb->text(); lined->setText( str.fromUtf8( str.latin1() ) ); @@ -244,9 +244,9 @@ void KCharSelectDia::toggleEntryDirection() { entryDirection ^= 1; if( entryDirection ) - lined->setAlignment( TQt::AlignRight ); + lined->tqsetAlignment( TQt::AlignRight ); else - lined->setAlignment( TQt::AlignLeft ); + lined->tqsetAlignment( TQt::AlignLeft ); } //================================================================== @@ -266,7 +266,7 @@ void KCharSelectDia::_exit() config->setGroup("General"); config->writeEntry("selectedFont",vFont); - config->writeEntry("char",static_cast<int>(vChr.unicode())); + config->writeEntry("char",static_cast<int>(vChr.tqunicode())); config->writeEntry("table",charSelect->tableNum()); config->writeEntry("entryDirection",entryDirection); config->sync(); diff --git a/kcharselect/kcharselectdia.h b/kcharselect/kcharselectdia.h index 4643f73..083d0a0 100644 --- a/kcharselect/kcharselectdia.h +++ b/kcharselect/kcharselectdia.h @@ -8,9 +8,9 @@ #define kcharselectdia_h -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <kpushbutton.h> #include <kcharselect.h> diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp index 4a680c2..695c6b0 100644 --- a/kdelirc/irkick/irkick.cpp +++ b/kdelirc/irkick/irkick.cpp @@ -244,7 +244,7 @@ void IRKick::executeAction(const IRAction &action) { TQString sname = ProfileServer::profileServer()->getServiceName(action.program()); if(!sname.isNull()) { - KPassivePopup::message("IRKick", i18n("Starting <b>%1</b>...").arg(action.application()), SmallIcon("irkick"), theTrayIcon); + KPassivePopup::message("IRKick", i18n("Starting <b>%1</b>...").tqarg(action.application()), SmallIcon("irkick"), theTrayIcon); KApplication::startServiceByDesktopName(sname); } } diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp index c12b9f0..632ac02 100644 --- a/kdelirc/kcmlirc/addaction.cpp +++ b/kdelirc/kcmlirc/addaction.cpp @@ -97,7 +97,7 @@ void AddAction::updateButton(const TQString &remote, const TQString &button) } else KMessageBox::error(this, i18n( "You did not select a mode of that remote control. Please use %1, " - "or revert back to select a different mode." ).arg( theMode.remoteName() ), + "or revert back to select a different mode." ).tqarg( theMode.remoteName() ), i18n( "Incorrect Remote Control Detected" )); if(indexOf(currentPage()) == 1) diff --git a/kdelirc/kcmlirc/addactionbase.ui b/kdelirc/kcmlirc/addactionbase.ui index f052889..c9a4559 100644 --- a/kdelirc/kcmlirc/addactionbase.ui +++ b/kdelirc/kcmlirc/addactionbase.ui @@ -65,7 +65,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>81</width> <height>31</height> @@ -125,7 +125,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>31</height> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>311</width> <height>20</height> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>321</width> <height>21</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -223,13 +223,13 @@ <property name="text"> <string>You are attempting to configure an action for a button on [remote] (in mode [mode]). Press a button on this remote control or select from the list.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -245,7 +245,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>41</height> @@ -289,7 +289,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>31</height> @@ -414,7 +414,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> @@ -512,7 +512,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout37</cstring> + <cstring>tqlayout37</cstring> </property> <hbox> <property name="name"> @@ -528,7 +528,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> @@ -604,7 +604,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>81</height> @@ -677,7 +677,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout35</cstring> + <cstring>tqlayout35</cstring> </property> <hbox> <property name="name"> @@ -685,7 +685,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout34</cstring> + <cstring>tqlayout34</cstring> </property> <vbox> <property name="name"> @@ -701,7 +701,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>111</height> @@ -739,7 +739,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>146</width> <height>21</height> @@ -785,7 +785,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>61</height> @@ -826,7 +826,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>61</height> @@ -870,7 +870,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>61</height> @@ -908,7 +908,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>51</height> @@ -957,7 +957,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>147</width> <height>21</height> @@ -1035,7 +1035,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>670</width> <height>20</height> @@ -1085,7 +1085,7 @@ <property name="text"> <string>This application may have multiple instances. In the case of having multiple instances at once when this action should be executed, choose a course of action:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -1171,7 +1171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>170</height> @@ -1218,7 +1218,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -1234,7 +1234,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>31</height> @@ -1278,7 +1278,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>31</height> @@ -1308,7 +1308,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>551</width> <height>20</height> @@ -1366,7 +1366,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>30</height> diff --git a/kdelirc/kcmlirc/editactionbase.ui b/kdelirc/kcmlirc/editactionbase.ui index 300c6de..d94cfc2 100644 --- a/kdelirc/kcmlirc/editactionbase.ui +++ b/kdelirc/kcmlirc/editactionbase.ui @@ -56,7 +56,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout40</cstring> + <cstring>tqlayout40</cstring> </property> <grid> <property name="name"> @@ -242,7 +242,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout36</cstring> + <cstring>tqlayout36</cstring> </property> <grid> <property name="name"> @@ -295,7 +295,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>91</height> @@ -339,7 +339,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>101</height> @@ -377,7 +377,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>101</height> @@ -415,7 +415,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>101</height> @@ -467,7 +467,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>111</height> @@ -486,7 +486,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>106</width> <height>0</height> @@ -503,7 +503,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>101</height> @@ -533,7 +533,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>481</width> <height>20</height> @@ -542,7 +542,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> @@ -584,7 +584,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>30</height> @@ -654,7 +654,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>491</width> <height>20</height> @@ -718,7 +718,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>670</width> <height>20</height> @@ -768,7 +768,7 @@ <property name="text"> <string>This application may have multiple instances. In the case of having multiple instances at once when this action should be executed, choose a course of action:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -854,7 +854,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>150</height> @@ -902,7 +902,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kdelirc/kcmlirc/editmodebase.ui b/kdelirc/kcmlirc/editmodebase.ui index 785287b..829a35d 100644 --- a/kdelirc/kcmlirc/editmodebase.ui +++ b/kdelirc/kcmlirc/editmodebase.ui @@ -43,7 +43,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout25</cstring> + <cstring>tqlayout25</cstring> </property> <grid> <property name="name"> @@ -62,7 +62,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <hbox> <property name="name"> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>21</height> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>410</width> <height>20</height> @@ -192,7 +192,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>90</height> @@ -215,7 +215,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> @@ -231,7 +231,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>231</width> <height>20</height> diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp index f94bb1b..8ec4fff 100644 --- a/kdelirc/kcmlirc/kcmlirc.cpp +++ b/kdelirc/kcmlirc/kcmlirc.cpp @@ -10,7 +10,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <tqradiobutton.h> #include <tqcombobox.h> @@ -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( updateModesStatus(TQListViewItem *) )); - connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionsStatus(TQListViewItem *) )); + 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->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::updateModesStatus(TQListViewItem *item) +void KCMLirc::updateModestqStatus(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::updateModesStatus(TQListViewItem *item) theKCMLircBase->theEditMode->setEnabled(item); } -void KCMLirc::updateActionsStatus(TQListViewItem *item) +void KCMLirc::updateActionstqStatus(TQListViewItem *item) { theKCMLircBase->theRemoveAction->setEnabled(item); theKCMLircBase->theEditAction->setEnabled(item); @@ -333,7 +333,7 @@ void KCMLirc::slotRemoveMode() if(!theKCMLircBase->theModes->selectedItem()) return; if(!theKCMLircBase->theModes->selectedItem()->parent()) return; - if(KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove %1 and all its actions?").arg(theKCMLircBase->theModes->selectedItem()->text(0)), i18n("Erase Actions?")) == KMessageBox::Continue) + if(KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove %1 and all its actions?").tqarg(theKCMLircBase->theModes->selectedItem()->text(0)), i18n("Erase Actions?")) == KMessageBox::Continue) { allModes.erase(modeMap[theKCMLircBase->theModes->selectedItem()]); updateModes(); @@ -374,10 +374,10 @@ void KCMLirc::updateActions() theKCMLircBase->theActions->clear(); actionMap.clear(); - if(!theKCMLircBase->theModes->selectedItem()) { updateActionsStatus(0); return; } + if(!theKCMLircBase->theModes->selectedItem()) { updateActionstqStatus(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>").arg(m.name()))); + 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()))); IRAItList l = allActions.findByMode(m); for(IRAItList::iterator i = l.begin(); i != l.end(); ++i) { TQListViewItem *b = new KListViewItem(theKCMLircBase->theActions, (**i).buttonName(), (**i).application(), (**i).function(), (**i).arguments().toString(), (**i).notes()); @@ -387,7 +387,7 @@ void KCMLirc::updateActions() if(theKCMLircBase->theActions->currentItem()) theKCMLircBase->theActions->currentItem()->setSelected(true); - updateActionsStatus(theKCMLircBase->theActions->currentItem()); + updateActionstqStatus(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); - updateModesStatus(theKCMLircBase->theModes->currentItem()); + updateModestqStatus(theKCMLircBase->theModes->currentItem()); updateActions(); } @@ -467,7 +467,7 @@ void KCMLirc::updateInformation() if(!theKCMLircBase->theExtensions->selectedItem()->parent()) { - theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").arg(theKCMLircBase->theExtensions->selectedItem()->text(0))); + theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").tqarg(theKCMLircBase->theExtensions->selectedItem()->text(0))); if(theKCMLircBase->theExtensions->selectedItem()->text(0) == i18n("Applications")) new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Applications"), TQString().setNum(theKCMLircBase->theExtensions->selectedItem()->childCount())); else if(theKCMLircBase->theExtensions->selectedItem()->text(0) == i18n("Remote Controls")) @@ -481,7 +481,7 @@ void KCMLirc::updateInformation() new TQListViewItem(theKCMLircBase->theInformation, i18n("Extension Author"), p->author()); new TQListViewItem(theKCMLircBase->theInformation, i18n("Application Identifier"), p->id()); new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Actions"), TQString().setNum(p->actions().count())); - theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").arg(p->name())); + theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").tqarg(p->name())); } else if(theKCMLircBase->theExtensions->selectedItem()->parent()->text(0) == i18n("Remote Controls")) { @@ -491,7 +491,7 @@ void KCMLirc::updateInformation() new TQListViewItem(theKCMLircBase->theInformation, i18n("Extension Author"), p->author()); new TQListViewItem(theKCMLircBase->theInformation, i18n("Remote Control Identifier"), p->id()); new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Buttons"), TQString().setNum(p->buttons().count())); - theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").arg(p->name())); + theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").tqarg(p->name())); } } diff --git a/kdelirc/kcmlirc/kcmlirc.h b/kdelirc/kcmlirc/kcmlirc.h index 6d65fe8..b4ea329 100644 --- a/kdelirc/kcmlirc/kcmlirc.h +++ b/kdelirc/kcmlirc/kcmlirc.h @@ -46,8 +46,8 @@ private: public slots: void updateActions(); - void updateModesStatus(TQListViewItem *); - void updateActionsStatus(TQListViewItem *); + void updateModestqStatus(TQListViewItem *); + void updateActionstqStatus(TQListViewItem *); void updateModes(); void updateExtensions(); void updateInformation(); diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/kdelirc/kcmlirc/kcmlircbase.ui index b8c8128..625b3a0 100644 --- a/kdelirc/kcmlirc/kcmlircbase.ui +++ b/kdelirc/kcmlirc/kcmlircbase.ui @@ -74,7 +74,7 @@ <property name="text"> <string>There are currently no remote controls available. You must first set up LIRC correctly; see www.lirc.org for more information.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>17</width> <height>20</height> @@ -204,7 +204,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -300,7 +300,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -316,7 +316,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>240</width> <height>21</height> @@ -325,7 +325,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> @@ -429,7 +429,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> diff --git a/kdelirc/kcmlirc/kcmlircbase.ui.h b/kdelirc/kcmlirc/kcmlircbase.ui.h index dcf2ec3..42faaab 100644 --- a/kdelirc/kcmlirc/kcmlircbase.ui.h +++ b/kdelirc/kcmlirc/kcmlircbase.ui.h @@ -32,6 +32,6 @@ void KCMLircBase::init() theModes->setItemsRenameable(true); modeLayout->addWidget(theModes); modeLayout->addLayout(modeButtonLayout); - modeLayout->invalidate(); + modeLayout->tqinvalidate(); modeLayout->activate(); } diff --git a/kdelirc/kcmlirc/newmode.ui b/kdelirc/kcmlirc/newmode.ui index 913b912..5726eba 100644 --- a/kdelirc/kcmlirc/newmode.ui +++ b/kdelirc/kcmlirc/newmode.ui @@ -40,7 +40,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -77,7 +77,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -93,7 +93,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> diff --git a/kdelirc/kcmlirc/selectprofile.ui b/kdelirc/kcmlirc/selectprofile.ui index 8731a66..5e15af9 100644 --- a/kdelirc/kcmlirc/selectprofile.ui +++ b/kdelirc/kcmlirc/selectprofile.ui @@ -54,7 +54,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout47</cstring> + <cstring>tqlayout47</cstring> </property> <hbox> <property name="name"> @@ -70,7 +70,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kdelirc/kdelirc/iraction.cpp b/kdelirc/kdelirc/iraction.cpp index ad558b5..f774bc4 100644 --- a/kdelirc/kdelirc/iraction.cpp +++ b/kdelirc/kdelirc/iraction.cpp @@ -97,7 +97,7 @@ const TQString IRAction::function() const if(theObject.isEmpty()) return i18n("Exit mode"); else - return i18n("Switch to %1").arg(theObject); + return i18n("Switch to %1").tqarg(theObject); else if(theObject.isEmpty()) return i18n("Just start"); diff --git a/kdessh/kdessh.cpp b/kdessh/kdessh.cpp index 6e6a48d..a3d5003 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::fromLatin1("ssh")).isEmpty()) + if (KStandardDirs::findExe(TQString::tqfromLatin1("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::fromLatin1("Passwords")); - int timeout = config->readNumEntry(TQString::fromLatin1("Timeout"), defTimeout); + config->setGroup(TQString::tqfromLatin1("Passwords")); + int timeout = config->readNumEntry(TQString::tqfromLatin1("Timeout"), defTimeout); SshProcess proc(host, user); proc.setStub(stub); diff --git a/kdessh/sshdlg.cpp b/kdessh/sshdlg.cpp index 31b0193..62dcd24 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::fromLatin1("%1@%2").arg(TQString(m_User)).arg(TQString(m_Host))); + setCaption(TQString::tqfromLatin1("%1@%2").tqarg(TQString(m_User)).tqarg(TQString(m_Host))); // Make the prompt a little more polite :-) - if (prompt.lower().left(6) == TQString::fromLatin1("enter ")) + if (prompt.lower().left(6) == TQString::tqfromLatin1("enter ")) prompt.remove(0, 6); int pos = prompt.find(':'); if (pos != -1) diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp index abec1b8..596cbcb 100644 --- a/kdf/disklist.cpp +++ b/kdf/disklist.cpp @@ -243,7 +243,7 @@ void DiskList::receivedDFStdErrOut(KProcess *, char *data, int len ) */ - TQString tmp = TQString::fromLatin1(data, len); + TQString tmp = TQString::tqfromLatin1(data, len); dfStringErrOut.append(tmp); } diff --git a/kdf/disks.cpp b/kdf/disks.cpp index c4af664..155e6e2 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::fromLatin1("mount -t%t -o%o %d %m"); + cmdS=TQString::tqfromLatin1("mount -t%t -o%o %d %m"); } - cmdS.replace(TQString::fromLatin1("%d"),deviceName()); - cmdS.replace(TQString::fromLatin1("%m"),mountPoint()); - cmdS.replace(TQString::fromLatin1("%t"),fsType()); - cmdS.replace(TQString::fromLatin1("%o"),mountOptions()); + cmdS.replace(TQString::tqfromLatin1("%d"),deviceName()); + cmdS.replace(TQString::tqfromLatin1("%m"),mountPoint()); + cmdS.replace(TQString::tqfromLatin1("%t"),fsType()); + cmdS.replace(TQString::tqfromLatin1("%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::fromLatin1("%d"),deviceName()); - cmdS.replace(TQString::fromLatin1("%m"),mountPoint()); + cmdS.replace(TQString::tqfromLatin1("%d"),deviceName()); + cmdS.replace(TQString::tqfromLatin1("%m"),mountPoint()); kdDebug() << "umount-cmd: [" << cmdS << "]" << endl; int e=sysCall(cmdS); @@ -226,11 +226,11 @@ int DiskEntry::sysCall(const TQString & command) { if (readingSysStdErrOut || sysProc->isRunning() ) return -1; - sysStringErrOut=i18n("Called: %1\n\n").arg(command); // put the called command on ErrOut + sysStringErrOut=i18n("Called: %1\n\n").tqarg(command); // put the called command on ErrOut sysProc->clearArguments(); (*sysProc) << command; if (!sysProc->start( KProcess::Block, KProcess::AllOutput )) - kdFatal() << i18n("could not execute %1").arg(command.local8Bit().data()) << endl; + kdFatal() << i18n("could not execute %1").tqarg(command.local8Bit().data()) << endl; if (sysProc->exitStatus()!=0) emit sysCallError(this, sysProc->exitStatus()); diff --git a/kdf/kcmdf.cpp b/kdf/kcmdf.cpp index 361ba90..2e26113 100644 --- a/kdf/kcmdf.cpp +++ b/kdf/kcmdf.cpp @@ -28,7 +28,7 @@ #include <kdialog.h> -#include <layout.h> +#include <tqlayout.h> #include "kcmdf.h" diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp index 45f0ec7..f963a12 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->sizeHint()); - kdf->resize(kdf->sizeHint()); + // kdf->setMinimumSize(kdf->tqsizeHint()); + kdf->resize(kdf->tqsizeHint()); setupGUI(KMainWindow::Keys | StatusBar | Save | Create); } diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp index 784e9c4..6831868 100644 --- a/kdf/kdfconfig.cpp +++ b/kdf/kdfconfig.cpp @@ -31,7 +31,7 @@ #include <tqcheckbox.h> #include <tqheader.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlcdnumber.h> #include <tqlineedit.h> diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp index 85c514e..8fbb97c 100644 --- a/kdf/kdfwidget.cpp +++ b/kdf/kdfwidget.cpp @@ -32,7 +32,7 @@ #include <tqheader.h> #include <tqtimer.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <kapplication.h> @@ -377,7 +377,7 @@ void KDFWidget::criticallyFull( DiskEntry *disk ) if( mStd.popupIfFull() == true ) { TQString msg = i18n("Device [%1] on [%2] is getting critically full!"). - arg(disk->deviceName()).arg(disk->mountPoint()); + tqarg(disk->deviceName()).tqarg(disk->mountPoint()); KMessageBox::sorry( this, msg, i18n("Warning")); } } diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp index b8963e3..8960e2f 100644 --- a/kdf/kwikdisk.cpp +++ b/kdf/kwikdisk.cpp @@ -176,13 +176,13 @@ void KwikDisk::updateDFDone() { // FIXME: tool tips are unused atm TQString toolTipText = i18n("%1 (%2) %3 on %4") - .arg( disk->mounted() ? i18n("Unmount") : i18n("Mount")) - .arg(disk->fsType()).arg(disk->deviceName()).arg(disk->mountPoint()); + .tqarg( disk->mounted() ? i18n("Unmount") : i18n("Mount")) + .tqarg(disk->fsType()).tqarg(disk->deviceName()).tqarg(disk->mountPoint()); TQString entryName = disk->mountPoint(); if( disk->mounted() ) { - entryName += TQString("\t\t\t[%1]").arg(disk->prettyKBAvail()); + entryName += TQString("\t\t\t[%1]").tqarg(disk->prettyKBAvail()); } int id = contextMenu()->insertItem("", this, TQT_SLOT(toggleMount(int)) ); contextMenu()->setItemParameter(id, itemNo); @@ -286,7 +286,7 @@ void KwikDisk::criticallyFull(DiskEntry *disk) if( m_options.popupIfFull() == true ) { TQString msg = i18n("Device [%1] on [%2] is getting critically full!") - .arg(disk->deviceName()).arg(disk->mountPoint()); + .tqarg(disk->deviceName()).tqarg(disk->mountPoint()); KMessageBox::sorry( this, msg, i18n("Warning")); } } diff --git a/kdf/listview.cpp b/kdf/listview.cpp index b9274c3..49021ee 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 sizeHint() +// 1) Easily set minimum number of visible items and to adjust the tqsizeHint() // 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 = sizeHint(); - setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() + + TQSize s = tqsizeHint(); + setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() + lineWidth() * 2, s.height() ); } } -TQSize CListView::sizeHint( void ) const +TQSize CListView::tqsizeHint( void ) const { - TQSize s = TQListView::sizeHint(); + TQSize s = TQListView::tqsizeHint(); int h = fontMetrics().height() + 2*itemMargin(); if( h % 2 > 0 ) { h++; } - s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height()); + s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height()); return( s ); } diff --git a/kdf/listview.h b/kdf/listview.h index 873a327..96ae398 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 sizeHint( void ) const; + virtual TQSize tqsizeHint( void ) const; const TQPixmap &icon( const TQString &iconName, bool drawBorder ); private: diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp index 1997bd0..1819760 100644 --- a/kdf/mntconfig.cpp +++ b/kdf/mntconfig.cpp @@ -29,7 +29,7 @@ #include <tqgroupbox.h> #include <tqheader.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #undef Unsorted @@ -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->sizeHint().height() ); + mIconButton->setFixedWidth( mIconButton->tqsizeHint().height() ); connect(mIconButton,TQT_SIGNAL(iconChanged(TQString)),this,TQT_SLOT(iconChangedButton(TQString))); gl->addWidget( mIconButton, 2, 1 ); @@ -258,7 +258,7 @@ void MntConfigWidget::iconChanged(const TQString &iconName) TQString msg = i18n("" "This filename is not valid: %1\n" "It must end with " - "\"_mount\" or \"_unmount\".").arg(iconName); + "\"_mount\" or \"_unmount\".").tqarg(iconName); KMessageBox::sorry( this, msg ); return; } diff --git a/kdf/optiondialog.cpp b/kdf/optiondialog.cpp index 0b7a7e4..6734294 100644 --- a/kdf/optiondialog.cpp +++ b/kdf/optiondialog.cpp @@ -17,7 +17,7 @@ * */ -#include <layout.h> +#include <tqlayout.h> #include "kdfconfig.h" #include "mntconfig.h" diff --git a/kedit/color.ui b/kedit/color.ui index bec67d9..2310c57 100644 --- a/kedit/color.ui +++ b/kedit/color.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>111</height> diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp index 4d2d878..d5bcba5 100644 --- a/kedit/kedit.cpp +++ b/kedit/kedit.cpp @@ -25,7 +25,7 @@ #include <stdlib.h> #include <unistd.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <tqpaintdevicemetrics.h> #include <tqpainter.h> @@ -84,7 +84,7 @@ TopLevel::TopLevel (TQWidget *, const char *name) setupEditWidget(); if (!initialGeometrySet()) - resize( TQSize(550, 400).expandedTo(minimumSizeHint())); + resize( TQSize(550, 400).expandedTo(tqminimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); @@ -265,7 +265,7 @@ void TopLevel::saveProperties(KConfig* config) { TQString name = m_url.url(); if (name.isEmpty()) - name = TQString("kedit%1-%2").arg(getpid()).arg((long)this); + name = TQString("kedit%1-%2").tqarg(getpid()).tqarg((long)this); TQString tmplocation = kapp->tempSaveName(m_url.url()); config->writeEntry("saved_to",tmplocation); saveFile(tmplocation, false, m_url.fileEncoding()); @@ -341,7 +341,7 @@ void TopLevel::insertDate(){ int line, column; TQString string; - TQDate dt = TQDate::currentDate(); + TQDate dt = TQDate::tqcurrentDate(); string = KGlobal::locale()->formatDate(dt); eframe->getCursorPosition(&line,&column); @@ -418,7 +418,7 @@ void TopLevel::spell_started( KSpell *) void TopLevel::spell_progress (unsigned int percent) { TQString s; - s = i18n("Spellcheck: %1% complete").arg(percent); + s = i18n("Spellcheck: %1% complete").tqarg(percent); statusBar()->changeItem (s, ID_GENERAL); } @@ -699,7 +699,7 @@ void TopLevel::file_save() if ( result == KEDIT_OK ){ TQString string; - string = i18n("Wrote: %1").arg(m_caption); + string = i18n("Wrote: %1").tqarg(m_caption); setGeneralStatusField(string); } } @@ -732,7 +732,7 @@ void TopLevel::file_save_as() { int result = KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. " - "Are you sure you want to overwrite it?" ).arg( u.prettyURL() ), + "Are you sure you want to overwrite it?" ).tqarg( u.prettyURL() ), i18n( "Overwrite File?" ), i18n( "Overwrite" ) ); @@ -748,7 +748,7 @@ void TopLevel::file_save_as() { m_url = u; setFileCaption(); - TQString string = i18n("Saved as: %1").arg(m_caption); + TQString string = i18n("Saved as: %1").tqarg(m_caption); setGeneralStatusField(string); recent->addURL( u ); } @@ -872,7 +872,7 @@ void TopLevel::setFileCaption() } TQString encoding = m_url.fileEncoding(); if (!encoding.isEmpty()) - m_caption += TQString(" (%1)").arg(encoding); + m_caption += TQString(" (%1)").tqarg(encoding); } setCaption(m_caption, eframe->isModified()); } @@ -887,8 +887,8 @@ void TopLevel::statusbar_slot(){ TQString linenumber; linenumber = i18n("Line: %1 Col: %2") - .arg(eframe->currentLine() + 1) - .arg(eframe->currentColumn() +1); + .tqarg(eframe->currentLine() + 1) + .tqarg(eframe->currentColumn() +1); statusBar()->changeItem(linenumber,ID_LINE_COLUMN); } @@ -896,8 +896,8 @@ void TopLevel::statusbar_slot(){ void TopLevel::print() { bool aborted = false; - TQString headerLeft = i18n("Date: %1").arg(KGlobal::locale()->formatDate(TQDate::currentDate(),true)); - TQString headerMid = i18n("File: %1").arg(m_caption); + TQString headerLeft = i18n("Date: %1").tqarg(KGlobal::locale()->formatDate(TQDate::tqcurrentDate(),true)); + TQString headerMid = i18n("File: %1").tqarg(m_caption); TQString headerRight; TQFont printFont = eframe->font(); @@ -908,7 +908,7 @@ void TopLevel::print() TQFontMetrics headerFontMetrics(headerFont); KPrinter *printer = new KPrinter; - if(printer->setup(this, i18n("Print %1").arg(m_caption))) { + if(printer->setup(this, i18n("Print %1").tqarg(m_caption))) { // set up KPrinter printer->setFullPage(false); printer->setCreator("KEdit"); @@ -932,7 +932,7 @@ void TopLevel::print() while(true) { - headerRight = TQString("#%1").arg(page); + headerRight = TQString("#%1").tqarg(page); dy = headerFontMetrics.lineSpacing(); TQRect body( 0, dy*2, metrics.width(), metrics.height()-dy*2); @@ -1125,7 +1125,7 @@ void TopLevel::openURL( const KURL& _url, int _mode ) if ( !_url.isValid() ) { TQString string; - string = i18n( "Malformed URL\n%1").arg(_url.url()); + string = i18n( "Malformed URL\n%1").tqarg(_url.url()); KMessageBox::sorry(this, string); return; @@ -1204,7 +1204,7 @@ void TopLevel::timer_slot(){ void TopLevel::set_colors() { - TQPalette mypalette = TQPalette((eframe->palette())); + TQPalette mypalette = TQPalette((eframe->tqpalette())); TQColorGroup ncgrp( mypalette.active() ); diff --git a/kedit/kedit.h b/kedit/kedit.h index 83c42aa..9faba86 100644 --- a/kedit/kedit.h +++ b/kedit/kedit.h @@ -24,7 +24,7 @@ #ifndef _KEDIT_H_ #define _KEDIT_H_ -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqptrdict.h> #include "version.h" diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp index 027ee2f..32dfc19 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::fromLatin1("charset") ); + mEncoding->setIcon( TQString::tqfromLatin1("charset") ); KToolBar *tb = toolBar(); mEncoding->plug( tb, pathComboIndex() - 1 ); @@ -88,7 +88,7 @@ void KTextFileDialog::slotShowEncCombo() TQComboBox *encCombo; TQVBox *vbox; - // Create widgets, and display using geometry management + // Create widgets, and display using tqgeometry management encDlg = new KDialogBase( this, "Encoding Dialog", true, i18n("Select Encoding"), KDialogBase::Ok | KDialogBase::Cancel ); @@ -96,7 +96,7 @@ void KTextFileDialog::slotShowEncCombo() vbox->setSpacing( KDialog::spacingHint() ); encDlg->setMainWidget( vbox ); label = new TQLabel( vbox ); - label->setAlignment( AlignLeft | AlignVCenter ); + label->tqsetAlignment( 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 956790d..76df775 100644 --- a/kedit/misc.ui +++ b/kedit/misc.ui @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>101</height> diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp index 3eef4ef..18851bc 100644 --- a/kfloppy/floppy.cpp +++ b/kfloppy/floppy.cpp @@ -22,7 +22,7 @@ */ -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <tqcursor.h> @@ -288,7 +288,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name) frame = new TQLabel( this, "NewsWindow" ); frame->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); - frame->setAlignment(WordBreak|ExpandTabs); + frame->tqsetAlignment(WordBreak|ExpandTabs); TQWhatsThis::add( frame, i18n("<qt>This is the status window, where error messages are displayed.</qt>") ); @@ -497,7 +497,7 @@ void FloppyData::format(){ if (KMessageBox::warningContinueCancel( this, i18n("<qt>Formatting will erase all data on the device:<br/><b>%1</b><br/>" "(Please check the correctness of the device name.)<br/>" - "Are you sure you wish to proceed?</qt>").arg( currentComboBoxDevice ) + "Are you sure you wish to proceed?</qt>").tqarg( currentComboBoxDevice ) , i18n("Proceed?") ) != KMessageBox::Continue) { return; @@ -539,7 +539,7 @@ void FloppyData::format(){ formatActions = new KFActionQueue(TQT_TQOBJECT(this)); connect(formatActions,TQT_SIGNAL(status(const TQString &,int)), - this,TQT_SLOT(formatStatus(const TQString &,int))); + this,TQT_SLOT(formattqStatus(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::formatStatus(const TQString &s,int p) +void FloppyData::formattqStatus(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 ead6b71..30b0519 100644 --- a/kfloppy/floppy.h +++ b/kfloppy/floppy.h @@ -75,7 +75,7 @@ public slots: void format(); void reset(); - void formatStatus(const TQString &,int); + void formattqStatus(const TQString &,int); protected slots: diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp index 35ed933..03f6f41 100644 --- a/kfloppy/format.cpp +++ b/kfloppy/format.cpp @@ -266,7 +266,7 @@ bool FloppyAction::configureDevice(int drive,int density) if ((drive<0) || (drive>1)) { - emit status(i18n("Unexpected drive number %1.").arg(drive),-1); + emit status(i18n("Unexpected drive number %1.").tqarg(drive),-1); return false; } @@ -278,7 +278,7 @@ bool FloppyAction::configureDevice(int drive,int density) } if (!deviceinfo) { - emit status(i18n("Unexpected density number %1.").arg(density),-1); + emit status(i18n("Unexpected density number %1.").tqarg(density),-1); return false; } @@ -294,7 +294,7 @@ bool FloppyAction::configureDevice(int drive,int density) if (!deviceinfo || !deviceinfo->devices) { emit status(i18n("Cannot find a device for drive %1 and density %2.") - .arg(drive).arg(density),-1); + .tqarg(drive).tqarg(density),-1); return false; } @@ -313,7 +313,7 @@ bool FloppyAction::configureDevice(int drive,int density) { const TQString str = i18n( "Cannot access %1\nMake sure that the device exists and that " - "you have write permission to it.").arg(deviceinfo->devices[0]); + "you have write permission to it.").tqarg(deviceinfo->devices[0]); emit status(str,-1); return false; } @@ -343,13 +343,13 @@ void FloppyAction::processDone(KProcess *p) } else { - emit status(i18n("The program %1 terminated with an error.").arg(theProcessName),100); + emit status(i18n("The program %1 terminated with an error.").tqarg(theProcessName),100); emit done(this,false); } } else { - emit status(i18n("The program %1 terminated abnormally.").arg(theProcessName),100); + emit status(i18n("The program %1 terminated abnormally.").tqarg(theProcessName),100); emit done(this,false); } } @@ -358,7 +358,7 @@ void FloppyAction::processStdOut(KProcess *, char *b, int l) { Q_UNUSED(b); Q_UNUSED(l); - kdDebug(KFAREA) << "stdout:" << TQString::fromLatin1(b,l) << endl; + kdDebug(KFAREA) << "stdout:" << TQString::tqfromLatin1(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::fromLatin1("fdformat"); + theProcessName = TQString::tqfromLatin1("fdformat"); setName("FDFormat"); } @@ -478,11 +478,11 @@ void FDFormat::processStdOut(KProcess *, char *b, int l) } else if (b[0]=='E') { - emit status(i18n("Error formatting track %1.").arg(formatTrackCount),-1); + emit status(i18n("Error formatting track %1.").tqarg(formatTrackCount),-1); } else { - s = TQString::fromLatin1(b,l); + s = TQString::tqfromLatin1(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::fromLatin1(b,l); + s = TQString::tqfromLatin1(b,l); DEBUGS(s); TQRegExp regexp( "([0-9]+)" ); if ( s.startsWith( "bad data at cyl" ) || ( s.find( "Problem reading cylinder" ) != -1 ) ) @@ -507,12 +507,12 @@ void FDFormat::processStdOut(KProcess *, char *b, int l) if ( regexp.search( s ) > -1 ) { const int track = regexp.cap(1).toInt(); - emit status(i18n("Low-level formatting error at track %1.").arg(track), -1); + emit status(i18n("Low-level formatting error at track %1.").tqarg(track), -1); } else { // This error should not happen - emit status(i18n("Low-level formatting error: %1").arg(s), -1); + emit status(i18n("Low-level formatting error: %1").tqarg(s), -1); } return; } @@ -532,7 +532,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l) // Be careful to leave "iotcl" as last before checking numbers else if (s.find("ioctl")!=-1) { - emit status(i18n("Low-level format error: %1").arg(s),-1); + emit status(i18n("Low-level format error: %1").tqarg(s),-1); return; } // Check for numbers at last (as /dev/fd0u1440 has numbers too) @@ -557,7 +557,7 @@ DDZeroOut::DDZeroOut(TQObject *p) : FloppyAction(p) { kdDebug(KFAREA) << (__PRETTY_FUNCTION__) << endl; - theProcessName = TQString::fromLatin1("dd"); + theProcessName = TQString::tqfromLatin1("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::fromLatin1( b, l ) ); + TQString s ( TQString::tqfromLatin1( b, l ) ); kdDebug(KFAREA) << s << endl; if (s.find("mounted file system")!=-1) // "/dev/fd0 contains a mounted file system { @@ -792,7 +792,7 @@ void UFSFilesystem::exec() // ### TODO: is it still needed? (FreeBSD 5.3's man page says: "For backward compatibility.") if ( deviceInfo ) - *p << "-T" << TQString("fd%1").arg(deviceInfo->blocks); + *p << "-T" << TQString("fd%1").tqarg(deviceInfo->blocks); *p << deviceName; @@ -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::fromLatin1( b, l ) ); + TQString s ( TQString::tqfromLatin1( 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::fromLatin1( b, l ) ); + TQString s ( TQString::tqfromLatin1( 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 672eb06..e774a8f 100644 --- a/kfloppy/zip.cpp +++ b/kfloppy/zip.cpp @@ -34,7 +34,7 @@ #include "zip.moc" #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <tqwhatsthis.h> @@ -188,7 +188,7 @@ void ZipFormat::transition() << "if=/dev/zero" << "of=/dev/afd0c" << "bs=8192" ; - *p << TQString("count=%1").arg(totalBlocks); + *p << TQString("count=%1").tqarg(totalBlocks); if (!p->start(KProcess::NotifyOnExit,KProcess::AllOutput)) { emit statusMessage(i18n("Cannot start dd to zero disk.")); @@ -250,8 +250,8 @@ void ZipFormat::processResult(KProcess *, char *b, int l) DEBUGSETUP; #ifdef DEBUG - TQString o = TQString::fromLatin1(b,l); - DEBUGS(TQString(" %1").arg(o).latin1()); + TQString o = TQString::tqfromLatin1(b,l); + DEBUGS(TQString(" %1").tqarg(o).latin1()); #endif switch(formatStep) @@ -264,8 +264,8 @@ void ZipFormat::processResult(KProcess *, char *b, int l) if (totalBlocks>10000) { emit statusMessage(i18n("Zeroing block %1 of %2...") - .arg(currentblock) - .arg(totalBlocks)); + .tqarg(currentblock) + .tqarg(totalBlocks)); } } break; @@ -283,7 +283,7 @@ void ZipFormat::processResult(KProcess *, char *b, int l) // emit setProgress(1); - // TQString myBuf = TQString::fromLatin1(b, l); + // TQString myBuf = TQString::tqfromLatin1(b, l); // DEBUGS(myBuf.latin1()); } break; diff --git a/kgpg/conf_decryption.ui b/kgpg/conf_decryption.ui index b604046..da86512 100644 --- a/kgpg/conf_decryption.ui +++ b/kgpg/conf_decryption.ui @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>155</height> diff --git a/kgpg/conf_encryption.ui b/kgpg/conf_encryption.ui index ff807aa..7fa0563 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="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>72</height> @@ -111,7 +111,7 @@ </spacer> <widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="4"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui index 8a7f14a..1109528 100644 --- a/kgpg/conf_gpg.ui +++ b/kgpg/conf_gpg.ui @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>190</width> <height>20</height> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>54</height> @@ -166,7 +166,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <vbox> <property name="name"> diff --git a/kgpg/conf_misc.ui b/kgpg/conf_misc.ui index 3455386..8c0a43e 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="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -71,7 +71,7 @@ <property name="name"> <cstring>kcfg_RemoteFileWarn</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -107,7 +107,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>20</height> @@ -132,7 +132,7 @@ It will shred (overwrite several times before erasing) the files you drop on it, making it almost impossible to recover the original file.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> @@ -143,7 +143,7 @@ the original file.</string> <property name="text"> <string>textLabel5</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -159,7 +159,7 @@ the original file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>71</height> @@ -220,7 +220,7 @@ the original file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>91</height> diff --git a/kgpg/conf_servers.ui b/kgpg/conf_servers.ui index f93b871..a765cd9 100644 --- a/kgpg/conf_servers.ui +++ b/kgpg/conf_servers.ui @@ -82,7 +82,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> diff --git a/kgpg/conf_ui2.ui b/kgpg/conf_ui2.ui index 1344d26..74a4a0b 100644 --- a/kgpg/conf_ui2.ui +++ b/kgpg/conf_ui2.ui @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>210</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>20</height> diff --git a/kgpg/detailedconsole.cpp b/kgpg/detailedconsole.cpp index 4e00b45..6874813 100644 --- a/kgpg/detailedconsole.cpp +++ b/kgpg/detailedconsole.cpp @@ -16,10 +16,10 @@ ***************************************************************************/ -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqvgroupbox.h> -#include <textedit.h> +#include <tqtextedit.h> #include <kmessagebox.h> #include <klocale.h> @@ -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->sizeHint()); + //labdetails->setMinimumSize(labdetails->tqsizeHint()); setDetailsWidget(detailsGroup); vbox->addWidget(lab1); diff --git a/kgpg/groupedit.ui b/kgpg/groupedit.ui index fe6d178..438d2b9 100644 --- a/kgpg/groupedit.ui +++ b/kgpg/groupedit.ui @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>20</height> diff --git a/kgpg/keyexport.ui b/kgpg/keyexport.ui index 4daae5b..8389aa3 100644 --- a/kgpg/keyexport.ui +++ b/kgpg/keyexport.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>350</width> <height>0</height> @@ -54,7 +54,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kgpg/keygener.cpp b/kgpg/keygener.cpp index 3ae0587..70bbff7 100644 --- a/kgpg/keygener.cpp +++ b/kgpg/keygener.cpp @@ -19,7 +19,7 @@ #include <tqwhatsthis.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqvbox.h> #include <kcombobox.h> @@ -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->sizeHint()); + keyexp->setMinimumSize(keyexp->tqsizeHint()); 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->sizeHint()); + keysize->setMinimumSize(keysize->tqsizeHint()); (void) new TQLabel(i18n("Algorithm:"),bgroup1); keykind = new KComboBox(bgroup1); keykind->insertItem("DSA & ElGamal"); keykind->insertItem("RSA"); - keykind->setMinimumSize(keykind->sizeHint()); + keykind->setMinimumSize(keykind->tqsizeHint()); vbox->addWidget(bgroup1); page->show(); - page->resize(page->maximumSize()); + page->resize(page->tqmaximumSize()); setMainWidget(page); } diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp index aa05301..93aa61f 100644 --- a/kgpg/keyinfowidget.cpp +++ b/kgpg/keyinfowidget.cpp @@ -31,7 +31,7 @@ #include <tqlabel.h> #include <kiconloader.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <kactivelabel.h> #include <klineedit.h> #include <ktrader.h> @@ -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->sizeHint()); + //prop->setMinimumSize(prop->tqsizeHint()); } void KgpgKeyInfo::slotDisableKey(bool isOn) @@ -378,14 +378,14 @@ chdate->show(); void KgpgKeyInfo::slotCheckDate(TQDate date) { -chdate->enableButtonOK(date>=TQDate::currentDate ()); +chdate->enableButtonOK(date>=TQDate::tqcurrentDate ()); } void KgpgKeyInfo::slotChangeDate() { KgpgInterface *KeyExpirationProcess=new KgpgInterface(); if (kb->isChecked()) - KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,TQDate::currentDate(),true); + KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,TQDate::tqcurrentDate(),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::currentDate ()); +chdate->enableButtonOK(kdt->date()>=TQDate::tqcurrentDate ()); } } diff --git a/kgpg/keyproperties.ui b/kgpg/keyproperties.ui index 7dce70b..485c182 100644 --- a/kgpg/keyproperties.ui +++ b/kgpg/keyproperties.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="3" rowspan="7" colspan="1"> <property name="name"> - <cstring>layout39</cstring> + <cstring>tqlayout39</cstring> </property> <vbox> <property name="name"> @@ -50,13 +50,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>140</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>140</height> @@ -81,7 +81,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="whatsThis" stdset="0"> @@ -92,7 +92,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> @@ -117,7 +117,7 @@ </widget> <widget class="TQLayoutWidget" row="7" column="3" rowspan="4" colspan="1"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> diff --git a/kgpg/keyserver.ui b/kgpg/keyserver.ui index 4087bde..40c81ec 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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp index 460134a..5f77590 100644 --- a/kgpg/keyservers.cpp +++ b/kgpg/keyservers.cpp @@ -24,8 +24,8 @@ #include <kcombobox.h> #include <kdialogbase.h> #include <kmessagebox.h> -#include <textcodec.h> -#include <layout.h> +#include <tqtextcodec.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqdialog.h> #include <tqpushbutton.h> @@ -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(sizeHint()); +setMinimumSize(tqsizeHint()); } @@ -201,7 +201,7 @@ void keyServer::slotSearch() searchproc->start(KProcess::NotifyOnExit,true); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); dialogServer->setMainWidget(listpop); - listpop->setMinimumSize(listpop->sizeHint()); + listpop->setMinimumSize(listpop->tqsizeHint()); listpop->setMinimumWidth(550); dialogServer->exec(); } @@ -261,8 +261,8 @@ void keyServer::slotsearchresult(KProcess *) dialogServer->enableButtonOK(true); TQApplication::restoreOverrideCursor(); nb=nb.setNum(keyNumbers); - //listpop->kLVsearch->setColumnText(0,i18n("Found %1 matching keys").arg(nb)); - listpop->statusText->setText(i18n("Found %1 matching keys").arg(nb)); + //listpop->kLVsearch->setColumnText(0,i18n("Found %1 matching keys").tqarg(nb)); + listpop->statusText->setText(i18n("Found %1 matching keys").tqarg(nb)); if (listpop->kLVsearch->firstChild()!=NULL) { listpop->kLVsearch->setSelected(listpop->kLVsearch->firstChild(),true); diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index 87e1157..1227498 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -18,7 +18,7 @@ #include <stdlib.h> #include <tqlabel.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqfile.h> #include <tqpopupmenu.h> #include <tqwidget.h> @@ -42,7 +42,7 @@ #include <klineedit.h> #include <kio/renamedlg.h> #include <kpassivepopup.h> -#include <layout.h> +#include <tqlayout.h> #include <tqbuttongroup.h> #include <kiconloader.h> #include <ktempfile.h> @@ -121,13 +121,13 @@ void MyView::clipEncrypt() void MyView::clipDecrypt() { - TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace(); + TQString clippie=kapp->tqclipboard()->text(clipboardMode).stripWhiteSpace(); droppedtext(clippie,false); } void MyView::clipSign(bool openEditor) { - TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace(); + TQString clippie=kapp->tqclipboard()->text(clipboardMode).stripWhiteSpace(); if (!clippie.isEmpty()) { KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey); connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); @@ -147,7 +147,7 @@ void MyView::encryptDroppedFolder() compressionScheme=0; kgpgfoldertmp=new KTempFile(TQString()); kgpgfoldertmp->setAutoDelete(true); - if (KMessageBox::warningContinueCancel(0,i18n("<qt>KGpg will now create a temporary archive file:<br><b>%1</b> to process the encryption. The file will be deleted after the encryption is finished.</qt>").arg(kgpgfoldertmp->name()),i18n("Temporary File Creation"),KStdGuiItem::cont(),"FolderTmpFile")==KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(0,i18n("<qt>KGpg will now create a temporary archive file:<br><b>%1</b> to process the encryption. The file will be deleted after the encryption is finished.</qt>").tqarg(kgpgfoldertmp->name()),i18n("Temporary File Creation"),KStdGuiItem::cont(),"FolderTmpFile")==KMessageBox::Cancel) return; dialogue=new popupPublic(0,"Public keys",droppedUrls.first().fileName(),true,goDefaultKey); @@ -302,10 +302,10 @@ void MyView::shredDroppedFile() KDialogBase *shredConfirm=new KDialogBase( this, "confirm_shred", true,i18n("Shred Files"),KDialogBase::Ok | KDialogBase::Cancel); TQWidget *page = new TQWidget(shredConfirm); shredConfirm->setMainWidget(page); -TQBoxLayout *layout=new TQBoxLayout(page,TQBoxLayout::TopToBottom,0); -layout->setAutoAdd(true); +TQBoxLayout *tqlayout=new TQBoxLayout(page,TQBoxLayout::TopToBottom,0); +tqlayout->setAutoAdd(true); -(void) new KActiveLabel( i18n("Do you really want to <a href=\"whatsthis:%1\">shred</a> these files?").arg(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>")),page); +(void) new KActiveLabel( i18n("Do you really want to <a href=\"whatsthis:%1\">shred</a> these files?").tqarg(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>")),page); KListBox *lb=new KListBox(page); lb->insertStringList(droppedUrls.toStringList()); if (shredConfirm->exec()==TQDialog::Accepted) @@ -400,7 +400,7 @@ void MyView::decryptDroppedFile() kgpgFolderExtract=new KTempFile(TQString(),".tar.gz"); kgpgFolderExtract->setAutoDelete(true); swapname=KURL(kgpgFolderExtract->name()); - if (KMessageBox::warningContinueCancel(0,i18n("<qt>The file to decrypt is an archive. KGpg will create a temporary unencrypted archive file:<br><b>%1</b> before processing the archive extraction. This temporary file will be deleted after the decryption is finished.</qt>").arg(kgpgFolderExtract->name()),i18n("Temporary File Creation"),KStdGuiItem::cont(),"FolderTmpDecFile")==KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(0,i18n("<qt>The file to decrypt is an archive. KGpg will create a temporary unencrypted archive file:<br><b>%1</b> before processing the archive extraction. This temporary file will be deleted after the decryption is finished.</qt>").tqarg(kgpgFolderExtract->name()),i18n("Temporary File Creation"),KStdGuiItem::cont(),"FolderTmpDecFile")==KMessageBox::Cancel) return; } else*/ { swapname=KURL(droppedUrls.first().directory(0,0)+oldname); @@ -560,7 +560,7 @@ void MyView::dropEvent (TQDropEvent *o) droppedfile(list); else if ( TQTextDrag::decode(o, text) ) { - TQApplication::clipboard()->setText(text,clipboardMode); + TQApplication::tqclipboard()->setText(text,clipboardMode); droppedtext(text); } } @@ -569,7 +569,7 @@ void MyView::dropEvent (TQDropEvent *o) void MyView::readOptions() { clipboardMode=TQClipboard::Clipboard; - if ( KGpgSettings::useMouseSelection() && kapp->clipboard()->supportsSelection()) + if ( KGpgSettings::useMouseSelection() && kapp->tqclipboard()->supportsSelection()) clipboardMode=TQClipboard::Selection; if (KGpgSettings::firstRun()) { @@ -804,7 +804,7 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name) void kgpgapplet::checkMenu() { KgpgDecryptClipboard->setEnabled(false); - if ((kapp->clipboard()->text(w->clipboardMode).isEmpty())) + if ((kapp->tqclipboard()->text(w->clipboardMode).isEmpty())) { KgpgEncryptClipboard->setEnabled(false); KgpgSignClipboard->setEnabled(false); @@ -812,7 +812,7 @@ void kgpgapplet::checkMenu() else { KgpgEncryptClipboard->setEnabled(true); - if (kapp->clipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN")) + if (kapp->tqclipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN")) KgpgDecryptClipboard->setEnabled(true); KgpgSignClipboard->setEnabled(true); } @@ -926,7 +926,7 @@ int KgpgAppletApp::newInstance() if ((KgpgInterface::getGpgBoolSetting("use-agent",gpgPath)) && (!getenv("GPG_AGENT_INFO"))) KMessageBox::sorry(0,i18n("<qt>The use of <b>GnuPG Agent</b> is enabled in GnuPG's configuration file (%1).<br>" "However, the agent does not seem to be running. This could result in problems with signing/decryption.<br>" - "Please disable GnuPG Agent from KGpg settings, or fix the agent.</qt>").arg(gpgPath)); + "Please disable GnuPG Agent from KGpg settings, or fix the agent.</qt>").tqarg(gpgPath)); } } @@ -1008,7 +1008,7 @@ int KgpgAppletApp::newInstance() void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,bool,bool symmetric) { - if (kapp->clipboard()->text(clipboardMode).isEmpty()) { + if (kapp->tqclipboard()->text(clipboardMode).isEmpty()) { KPassivePopup::message(i18n("Clipboard is empty."),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this); return; } @@ -1020,12 +1020,12 @@ void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,boo KgpgInterface *txtEncrypt=new KgpgInterface(); connect (txtEncrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotSetClip(TQString))); connect (txtEncrypt,TQT_SIGNAL(txtencryptionstarted()),TQT_TQOBJECT(this),TQT_SLOT(slotPassiveClip())); - txtEncrypt->KgpgEncryptText(kapp->clipboard()->text(clipboardMode),selec,encryptOptions); + txtEncrypt->KgpgEncryptText(kapp->tqclipboard()->text(clipboardMode),selec,encryptOptions); } void MyView::slotPassiveClip() { -TQString newtxt=kapp->clipboard()->text(clipboardMode); +TQString newtxt=kapp->tqclipboard()->text(clipboardMode); if (newtxt.length()>300) newtxt=TQString(newtxt.left(250).stripWhiteSpace())+"...\n"+TQString(newtxt.right(40).stripWhiteSpace()); @@ -1045,7 +1045,7 @@ pop = new KPassivePopup( this); void MyView::slotSetClip(TQString newtxt) { if (newtxt.isEmpty()) return; - TQApplication::clipboard()->setText(newtxt,clipboardMode);//,TQClipboard::Clipboard); QT 3.1 only + TQApplication::tqclipboard()->setText(newtxt,clipboardMode);//,TQClipboard::Clipboard); QT 3.1 only } diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h index ba4e958..5fa6089 100644 --- a/kgpg/kgpg.h +++ b/kgpg/kgpg.h @@ -30,7 +30,7 @@ #include <tqlabel.h> #include <tqstringlist.h> -#include <clipboard.h> +#include <tqclipboard.h> class TQPopupMenu; diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp index e0321e4..c36be3d 100644 --- a/kgpg/kgpgeditor.cpp +++ b/kgpg/kgpgeditor.cpp @@ -27,8 +27,8 @@ #include <kencodingfiledialog.h> #include <tqradiobutton.h> -#include <clipboard.h> -#include <textcodec.h> +#include <tqclipboard.h> +#include <tqtextcodec.h> #include <tqpainter.h> #include <kprinter.h> #include <kmessagebox.h> @@ -250,8 +250,8 @@ void KgpgApp::slotFilePreDec() page->newFilename->setCaption(i18n("Save File")); page->checkClipboard->setText(i18n("Editor")); - page->resize(page->minimumSize()); - popn->resize(popn->minimumSize()); + page->resize(page->tqminimumSize()); + popn->resize(popn->tqminimumSize()); if (popn->exec()==TQDialog::Accepted) { if (page->checkFile->isChecked()) newname=page->newFilename->url(); @@ -314,7 +314,7 @@ void KgpgApp::slotFileSave() TQTextCodec*cod=TQTextCodec::codecForName (textEncoding.ascii()); // slotStatusMsg(i18n("Saving file...")); if (!checkEncoding(cod)) { - KMessageBox::sorry(this,i18n("The document could not been saved, as the selected encoding cannot encode every unicode character in it.")); + KMessageBox::sorry(this,i18n("The document could not been saved, as the selected encoding cannot encode every tqunicode character in it.")); return; } @@ -376,7 +376,7 @@ void KgpgApp::slotFileSaveAs() TQString filn=url.path(); TQFile f(filn); if (f.exists()) { - TQString message=i18n("Overwrite existing file %1?").arg(url.fileName()); + TQString message=i18n("Overwrite existing file %1?").tqarg(url.fileName()); int result=KMessageBox::warningContinueCancel(this,TQString(message),i18n("Warning"),i18n("Overwrite")); if (result==KMessageBox::Cancel) return; @@ -385,7 +385,7 @@ void KgpgApp::slotFileSaveAs() } else if (KIO::NetAccess::exists(url,false,this)) { - TQString message=i18n("Overwrite existing file %1?").arg(url.fileName()); + TQString message=i18n("Overwrite existing file %1?").tqarg(url.fileName()); int result=KMessageBox::warningContinueCancel(this,TQString(message),i18n("Warning"),i18n("Overwrite")); if (result==KMessageBox::Cancel) return; diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index 0a54db1..b45240d 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -18,8 +18,8 @@ #include <stdio.h> #include <tqdialog.h> -#include <clipboard.h> -#include <layout.h> +#include <tqclipboard.h> +#include <tqlayout.h> #include <tqregexp.h> #include <tqstring.h> #include <tqlabel.h> @@ -36,7 +36,7 @@ #include <kpassivepopup.h> #include <kiconloader.h> #include <kaction.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <kprocess.h> #include <kprocio.h> #include <kconfig.h> @@ -219,9 +219,9 @@ void KgpgInterface::readdecprocess(KProcIO *p) if (anonymous) passdlgmessage=i18n("<b>No user id found</b>. Trying all secret keys.<br>"); if ((step<3) && (!anonymous)) - passdlgmessage=i18n("<b>Bad passphrase</b>. You have %1 tries left.<br>").arg(step); + passdlgmessage=i18n("<b>Bad passphrase</b>. You have %1 tries left.<br>").tqarg(step); - passdlgmessage+=i18n("Enter passphrase for <b>%1</b>").arg(userIDs); + passdlgmessage+=i18n("Enter passphrase for <b>%1</b>").tqarg(userIDs); int code=KPasswordDialog::getPassword(passphrase,passdlgmessage); if (code!=TQDialog::Accepted) { p->deleteLater(); @@ -395,8 +395,8 @@ void KgpgInterface::getCmdOutput(KProcess *p, char *data, int ) if (anonymous) passdlgmessage=i18n("<b>No user id found</b>. Trying all secret keys.<br>"); if ((step<3) && (!anonymous)) - passdlgmessage=i18n("<b>Bad passphrase</b>. You have %1 tries left.<br>").arg(step); - passdlgmessage+=i18n("Enter passphrase for <b>%1</b>").arg(userIDs); + passdlgmessage=i18n("<b>Bad passphrase</b>. You have %1 tries left.<br>").tqarg(step); + passdlgmessage+=i18n("Enter passphrase for <b>%1</b>").tqarg(userIDs); int code=KPasswordDialog::getPassword(passphrase,passdlgmessage); if (code!=TQDialog::Accepted) { @@ -501,8 +501,8 @@ void KgpgInterface::txtsignprocess(KProcIO *p) TQCString passphrase; TQString passdlgmessage; if (step<3) - passdlgmessage=i18n("<b>Bad passphrase</b>. You have %1 tries left.<br>").arg(step); - passdlgmessage+=i18n("Enter passphrase for <b>%1</b>").arg(userIDs); + passdlgmessage=i18n("<b>Bad passphrase</b>. You have %1 tries left.<br>").tqarg(step); + passdlgmessage+=i18n("Enter passphrase for <b>%1</b>").tqarg(userIDs); int code=KPasswordDialog::getPassword(passphrase,passdlgmessage); if (code!=TQDialog::Accepted) { @@ -588,11 +588,11 @@ TQString required; { TQString userName=required.section(" ",2,-1).replace(TQRegExp("<"),"<"); userName=checkForUtf8(userName); - signID=i18n("<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>").arg(userName).arg("0x"+required.section(" ",1,1).right(8)); + signID=i18n("<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>").tqarg(userName).tqarg("0x"+required.section(" ",1,1).right(8)); } if (required.startsWith("BADSIG")) { - signID=i18n("<qt><b>Bad signature</b> from:<br>%1<br>Key ID: %2<br><br><b>Text is corrupted.</b></qt>").arg(required.section(" ",2,-1).replace(TQRegExp("<"),"<")).arg("0x"+required.section(" ",1,1).right(8)); + signID=i18n("<qt><b>Bad signature</b> from:<br>%1<br>Key ID: %2<br><br><b>Text is corrupted.</b></qt>").tqarg(required.section(" ",2,-1).replace(TQRegExp("<"),"<")).tqarg("0x"+required.section(" ",1,1).right(8)); } if (required.startsWith("NO_PUBKEY")) { @@ -628,7 +628,7 @@ Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( p TQGridLayout *MyDialogLayout = new TQGridLayout( page, 1, 1, 5, 6, "MyDialogLayout"); TQLabel *TextLabel1 = new TQLabel( page, "TextLabel1" ); - TextLabel1->setText(i18n("MD5 sum for <b>%1</b> is:").arg(url.fileName())); + TextLabel1->setText(i18n("MD5 sum for <b>%1</b> is:").tqarg(url.fileName())); MyDialogLayout->addWidget( TextLabel1, 0, 0 ); KLineEdit *KRestrictedLine1 = new KLineEdit(mdSum,page); @@ -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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, KLed1->sizePolicy().hasHeightForWidth() ) ); + KLed1->tqsetSizePolicy( 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->minimumSize()); + page->resize(page->tqminimumSize()); setMainWidget(page); @@ -664,7 +664,7 @@ Md5Widget::~Md5Widget() void Md5Widget::slotApply() { - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); TQString text; // Copy text from the clipboard (paste) text = cb->text(TQClipboard::Clipboard); @@ -715,7 +715,7 @@ void KgpgInterface::KgpgSignFile(TQString keyID,KURL srcUrl,TQStringList Options void KgpgInterface::signfin(KProcess *) { if (message.find("SIG_CREATED")!=-1) - KMessageBox::information(0,i18n("The signature file %1 was successfully created.").arg(file.fileName())); + KMessageBox::information(0,i18n("The signature file %1 was successfully created.").tqarg(file.fileName())); else if (message.find("BAD_PASSPHRASE")!=-1) KMessageBox::sorry(0,i18n("Bad passphrase, signature was not created.")); else @@ -740,8 +740,8 @@ void KgpgInterface::readsignprocess(KProcIO *p) TQCString passphrase; TQString passdlgmessage; if (step<3) - passdlgmessage=i18n("<b>Bad passphrase</b>. you have %1 tries left.<br>").arg(step); - passdlgmessage+=i18n("Enter passphrase for <b>%1</b>").arg(userIDs); + passdlgmessage=i18n("<b>Bad passphrase</b>. you have %1 tries left.<br>").tqarg(step); + passdlgmessage+=i18n("Enter passphrase for <b>%1</b>").tqarg(userIDs); int code=KPasswordDialog::getPassword(passphrase,passdlgmessage); if (code!=TQDialog::Accepted) { p->deleteLater(); @@ -799,12 +799,12 @@ TQString required; signID=i18n("No signature found."); if (required.startsWith("GOODSIG")) { - signID=i18n("<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>").arg(required.section(" ",2,-1).replace(TQRegExp("<"),"<")).arg("0x"+required.section(" ",1,1).right(8)); + signID=i18n("<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>").tqarg(required.section(" ",2,-1).replace(TQRegExp("<"),"<")).tqarg("0x"+required.section(" ",1,1).right(8)); } if (required.startsWith("BADSIG")) { signID=i18n("<qt><b>BAD signature</b> from:<br> %1<br>Key id: %2<br><br>" - "<b>The file is corrupted!</b></qt>").arg(required.section(" ",2,-1).replace(TQRegExp("<"),"<")).arg("0x"+required.section(" ",1,1).right(8)); + "<b>The file is corrupted!</b></qt>").tqarg(required.section(" ",2,-1).replace(TQRegExp("<"),"<")).tqarg("0x"+required.section(" ",1,1).right(8)); } if (required.startsWith("NO_PUBKEY")) { @@ -827,7 +827,7 @@ void KgpgInterface::verifyfin(KProcess *) } else { if (KMessageBox::questionYesNo(0,i18n("<qt><b>Missing signature:</b><br>Key id: %1<br><br>" - "Do you want to import this key from a keyserver?</qt>").arg(signID),file.fileName(),TQString(), i18n("Import"), i18n("Do Not Import"))==KMessageBox::Yes) + "Do you want to import this key from a keyserver?</qt>").tqarg(signID),file.fileName(),TQString(), i18n("Import"), i18n("Do Not Import"))==KMessageBox::Yes) emit verifyquerykey(signID); } emit verifyfinished(); @@ -908,7 +908,7 @@ void KgpgInterface::sigprocess(KProcIO *p) if (required.find("passphrase.enter")!=-1) { TQCString signpass; int code=KPasswordDialog::getPassword(signpass,i18n("<qt>%1 Enter passphrase for <b>%2</b>:</qt>") - .arg(errMessage).arg(userIDs)); + .tqarg(errMessage).tqarg(userIDs)); if (code!=TQDialog::Accepted) { signSuccess=4; ///// aborted by user mode required=TQString(); @@ -947,7 +947,7 @@ void KgpgInterface::signover(KProcess *) emit signatureFinished(signSuccess); //// signature successful or bad passphrase else { KDetailedConsole *q=new KDetailedConsole(0,"sign_error",i18n("<qt>Signing key <b>%1</b> with key <b>%2</b> failed.<br>" - "Do you want to try signing the key in console mode?</qt>").arg(konsKeyID).arg(konsSignKey),output); + "Do you want to try signing the key in console mode?</qt>").tqarg(konsKeyID).tqarg(konsSignKey),output); if (q->exec()==TQDialog::Accepted) openSignConsole(); else @@ -1079,7 +1079,7 @@ void KgpgInterface::KgpgKeyExpire(TQString keyID,TQDate date,bool unlimited) if (unlimited) expirationDelay=0; else - expirationDelay=TQDate::currentDate().daysTo(date); + expirationDelay=TQDate::tqcurrentDate().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"; @@ -1112,7 +1112,7 @@ void KgpgInterface::expprocess(KProcIO *p) if (required.find("passphrase.enter")!=-1) { TQCString signpass; - int code=KPasswordDialog::getPassword(signpass,i18n("<qt>Enter passphrase for <b>%1</b>:</qt>").arg(userIDs)); + int code=KPasswordDialog::getPassword(signpass,i18n("<qt>Enter passphrase for <b>%1</b>:</qt>").tqarg(userIDs)); if (code!=TQDialog::Accepted) { expSuccess=3; ///// aborted by user mode p->writeStdin(TQString("quit")); @@ -1276,7 +1276,7 @@ void KgpgInterface::passprocess(KProcIO *p) if (step==1) { TQCString passphrase; int code=KPasswordDialog::getPassword(passphrase,i18n("<qt>%1 Enter passphrase for <b>%2</b></qt>") - .arg(message).arg(userIDs)); + .tqarg(message).tqarg(userIDs)); if (code!=TQDialog::Accepted) { p->writeStdin(TQString("quit")); // p->closeWhenDone(); @@ -1290,7 +1290,7 @@ void KgpgInterface::passprocess(KProcIO *p) if (step==3) { TQCString passphrase; - int code=KPasswordDialog::getNewPassword(passphrase,i18n("<qt>Enter new passphrase for <b>%1</b><br>If you forget this passphrase, all your encrypted files and messages will be lost !<br></qt>").arg(userIDs)); + int code=KPasswordDialog::getNewPassword(passphrase,i18n("<qt>Enter new passphrase for <b>%1</b><br>If you forget this passphrase, all your encrypted files and messages will be lost !<br></qt>").tqarg(userIDs)); if (code!=TQDialog::Accepted) { step=4; p->writeStdin(TQString("quit")); @@ -1517,7 +1517,7 @@ void KgpgInterface::adduidprocess(KProcIO *p) if (required.find("passphrase.enter")!=-1) { TQCString delpass; int code=KPasswordDialog::getPassword(delpass,i18n("<qt>Enter passphrase for <b>%1</b>:</qt>") - .arg(userIDs)); + .tqarg(userIDs)); if (code!=TQDialog::Accepted) { //addSuccess=false; p->writeStdin(TQString("quit")); @@ -1639,7 +1639,7 @@ void KgpgInterface::delphotoprocess(KProcIO *p) if (required.find("passphrase.enter")!=-1) { TQCString delpass; - int code=KPasswordDialog::getPassword(delpass,i18n("<qt>Enter passphrase for <b>%1</b>:</qt>").arg(userIDs)); + int code=KPasswordDialog::getPassword(delpass,i18n("<qt>Enter passphrase for <b>%1</b>:</qt>").tqarg(userIDs)); if (code!=TQDialog::Accepted) { //deleteSuccess=false; p->writeStdin(TQString("quit")); @@ -1714,7 +1714,7 @@ void KgpgInterface::addphotoprocess(KProcIO *p) if (required.find("passphrase.enter")!=-1) { TQCString delpass; - int code=KPasswordDialog::getPassword(delpass,i18n("<qt>Enter passphrase for <b>%1</b>:</qt>").arg(userIDs)); + int code=KPasswordDialog::getPassword(delpass,i18n("<qt>Enter passphrase for <b>%1</b>:</qt>").tqarg(userIDs)); if (code!=TQDialog::Accepted) { //deleteSuccess=false; p->writeStdin(TQString("quit")); @@ -1800,7 +1800,7 @@ void KgpgInterface::revokeprocess(KProcIO *p) if (required.find("passphrase.enter")!=-1) { TQCString signpass; - int code=KPasswordDialog::getPassword(signpass,i18n("<qt>Enter passphrase for <b>%1</b>:</qt>").arg(userIDs)); + int code=KPasswordDialog::getPassword(signpass,i18n("<qt>Enter passphrase for <b>%1</b>:</qt>").tqarg(userIDs)); if (code!=TQDialog::Accepted) { expSuccess=3; ///// aborted by user mode p->writeStdin(TQString("quit")); @@ -1928,7 +1928,7 @@ void KgpgInterface::setGpgGroupSetting(TQString name,TQStringList values, TQStri if (result2.startsWith(name) && (result2.remove(0,name.length()).stripWhiteSpace().startsWith("="))) { // kdDebug(2100)<<"Found group: "<<name<<endl; //kdDebug(2100)<<"New values: "<<values<<endl; - result=TQString("group %1=%2").arg(name).arg(values.join(" ")); + result=TQString("group %1=%2").tqarg(name).tqarg(values.join(" ")); found=true; } } @@ -1937,7 +1937,7 @@ void KgpgInterface::setGpgGroupSetting(TQString name,TQStringList values, TQStri } qfile.close(); if (!found) - textToWrite+="\n"+TQString("group %1=%2").arg(name).arg(values.join(" ")); + textToWrite+="\n"+TQString("group %1=%2").tqarg(name).tqarg(values.join(" ")); if (qfile.open(IO_WriteOnly)) { TQTextStream t( &qfile); diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp index 418c53e..2d7f0ad 100644 --- a/kgpg/kgpglibrary.cpp +++ b/kgpg/kgpglibrary.cpp @@ -104,8 +104,8 @@ void KgpgLibrary::fastencode(KURL &fileToCrypt,TQStringList selec,TQStringList e } int filesToEncode=urlselecteds.count(); if (filesToEncode>1) - emit systemMessage(i18n("<b>%1 Files left.</b>\nEncrypting </b>%2").arg(filesToEncode).arg(urlselecteds.first().path())); - else emit systemMessage(i18n("<b>Encrypting </b>%2").arg(urlselecteds.first().path())); + emit systemMessage(i18n("<b>%1 Files left.</b>\nEncrypting </b>%2").tqarg(filesToEncode).tqarg(urlselecteds.first().path())); + else emit systemMessage(i18n("<b>Encrypting </b>%2").tqarg(urlselecteds.first().path())); KgpgInterface *cryptFileProcess=new KgpgInterface(); pop = new KPassivePopup(panel); cryptFileProcess->KgpgEncryptFile(selec,urlselected,dest,encryptOptions,symetric); @@ -122,7 +122,7 @@ void KgpgLibrary::processpopup2(TQString fileName) { //pop->setTimeout(0); - pop->setView(i18n("Processing encryption (%1)").arg(fileName),i18n("Please wait..."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); + pop->setView(i18n("Processing encryption (%1)").tqarg(fileName),i18n("Please wait..."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); pop->show(); /*TQRect qRect(TQApplication::desktop()->screenGeometry()); int iXpos=qRect.width()/2-pop->width()/2; @@ -192,7 +192,7 @@ void KgpgLibrary::slotFileDec(KURL srcUrl,KURL destUrl,TQStringList customDecryp void KgpgLibrary::processpopup(TQString fileName) { - emit systemMessage(i18n("Decrypting %1").arg(fileName)); + emit systemMessage(i18n("Decrypting %1").tqarg(fileName)); pop->setTimeout(0); pop->setView(i18n("Processing decryption"),i18n("Please wait..."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); pop->show(); @@ -222,7 +222,7 @@ void KgpgLibrary::processdecerror(TQString mssge) qfile.close(); ////////////// if pgp data found, decode it if (result.startsWith("-----BEGIN PGP PUBLIC KEY BLOCK")) {////// dropped file is a public key, ask for import - int result=KMessageBox::warningContinueCancel(0,i18n("<p>The file <b>%1</b> is a public key.<br>Do you want to import it ?</p>").arg(urlselected.path()),i18n("Warning")); + int result=KMessageBox::warningContinueCancel(0,i18n("<p>The file <b>%1</b> is a public key.<br>Do you want to import it ?</p>").tqarg(urlselected.path()),i18n("Warning")); if (result==KMessageBox::Cancel) return; else { @@ -233,7 +233,7 @@ void KgpgLibrary::processdecerror(TQString mssge) } } else if (result.startsWith("-----BEGIN PGP PRIVATE KEY BLOCK")) {////// dropped file is a public key, ask for import qfile.close(); - KMessageBox::information(0,i18n("<p>The file <b>%1</b> is a private key block. Please use KGpg key manager to import it.</p>").arg(urlselected.path())); + KMessageBox::information(0,i18n("<p>The file <b>%1</b> is a private key block. Please use KGpg key manager to import it.</p>").tqarg(urlselected.path())); return; } } diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index 76b9eaf..211fb77 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -18,7 +18,7 @@ /////////////////////////////////////////////// code for the option dialog box #include <config.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtabwidget.h> #include <tqlabel.h> #include <tqtoolbutton.h> diff --git a/kgpg/kgpgrevokewidget.ui b/kgpg/kgpgrevokewidget.ui index e4f30ff..2405494 100644 --- a/kgpg/kgpgrevokewidget.ui +++ b/kgpg/kgpgrevokewidget.ui @@ -26,7 +26,7 @@ <property name="text"> <string>key id</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp index 06ea2aa..f85563c 100644 --- a/kgpg/kgpgview.cpp +++ b/kgpg/kgpgview.cpp @@ -32,12 +32,12 @@ #include <kmessagebox.h> #include <tqfile.h> -#include <layout.h> +#include <tqlayout.h> #include <kbuttonbox.h> #include <unistd.h> #include <kaction.h> #include <klineedit.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include "kgpgsettings.h" @@ -127,7 +127,7 @@ TQFile qfile(fileToCheck); } else if (result.startsWith("-----BEGIN PGP PUBLIC KEY BLOCK")) {////// dropped file is a public key, ask for import qfile.close(); - int result=KMessageBox::warningContinueCancel(this,i18n("<p>The file <b>%1</b> is a public key.<br>Do you want to import it ?</p>").arg(fileToCheck),i18n("Warning")); + int result=KMessageBox::warningContinueCancel(this,i18n("<p>The file <b>%1</b> is a public key.<br>Do you want to import it ?</p>").tqarg(fileToCheck),i18n("Warning")); if (result==KMessageBox::Cancel) { KIO::NetAccess::removeTempFile(fileToCheck); return true; @@ -195,7 +195,7 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name) editor=new MyEditor(this); windowAutoClose=true; - ///// layout + ///// tqlayout TQVBoxLayout *vbox=new TQVBoxLayout(this,3); @@ -214,8 +214,8 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name) TQObject::connect(editor,TQT_SIGNAL(textChanged()),TQT_TQOBJECT(this),TQT_SLOT(modified())); - boutonbox->layout(); - editor->resize(editor->maximumSize()); + boutonbox->tqlayout(); + editor->resize(editor->tqmaximumSize()); vbox->addWidget(editor); vbox->addWidget(boutonbox); } @@ -239,7 +239,7 @@ void KgpgView::modified() void KgpgView::slotAskForImport(TQString ID) { if (KMessageBox::questionYesNo(0,i18n("<qt><b>Missing signature:</b><br>Key id: %1<br><br>" - "Do you want to import this key from a keyserver?</qt>").arg(ID),i18n("Missing Key"), TQString(), i18n("Import"), i18n("Do Not Import"))==KMessageBox::Yes) { + "Do you want to import this key from a keyserver?</qt>").tqarg(ID),i18n("Missing Key"), TQString(), i18n("Import"), i18n("Do Not Import"))==KMessageBox::Yes) { keyServer *kser=new keyServer(0,"server_dialog",false,true); kser->page->kLEimportid->setText(ID); kser->slotImport(); diff --git a/kgpg/kgpgwizard.ui b/kgpg/kgpgwizard.ui index c607b30..b826975 100644 --- a/kgpg/kgpgwizard.ui +++ b/kgpg/kgpgwizard.ui @@ -50,7 +50,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -62,7 +62,7 @@ <string><h1>Welcome to the KGpg Wizard</h1> This wizard will first setup some basic configuration options required for KGpg to work properly. Next, it will allow you to create your own key pair, enabling you to encrypt your files and emails.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>41</height> @@ -111,7 +111,7 @@ This wizard will first setup some basic configuration options required for KGpg <property name="text"> <string>Unless you want to try some unusual settings, just click on the "next" button.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -122,7 +122,7 @@ This wizard will first setup some basic configuration options required for KGpg <property name="text"> <string>KGpg needs to know where your GnuPG configuration file is stored.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> @@ -155,7 +155,7 @@ This wizard will first setup some basic configuration options required for KGpg <property name="text"> <string><br>Path to your GnuPG options file:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -183,7 +183,7 @@ This wizard will first setup some basic configuration options required for KGpg <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -235,7 +235,7 @@ This wizard will first setup some basic configuration options required for KGpg <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -266,7 +266,7 @@ The shredder securely deletes files (overwriting them 35 times) dropped on to it Remember that if you download a file or open one in an editor, parts of the file may be saved in a temporary location. Shredding will not erase these temporary files. <br><b>Shredding may not be 100% secure if you use a journaling file system.</b></qt></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> @@ -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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -313,7 +313,7 @@ Remember that if you download a file or open one in an editor, parts of the file </spacer> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -349,7 +349,7 @@ Remember that if you download a file or open one in an editor, parts of the file <property name="text"> <string>KGpg will now launch the key generation dialog to create your own key pair for encryption and decryption.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -377,7 +377,7 @@ Remember that if you download a file or open one in an editor, parts of the file <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index 5c0a5c4..5f01af7 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -23,14 +23,14 @@ #include <tqdir.h> #include <tqfile.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvariant.h> #include <tqregexp.h> #include <tqpainter.h> #include <tqvbox.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqkeysequence.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <kstatusbar.h> #include <tqtimer.h> #include <tqpaintdevicemetrics.h> @@ -137,7 +137,7 @@ UpdateViewItem::UpdateViewItem(TQListViewItem *parent, TQString name,TQString em } -void UpdateViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int alignment) +void UpdateViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int tqalignment) { TQColorGroup _cg( cg ); if (depth()==0) @@ -157,7 +157,7 @@ void UpdateViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,int column, } - KListViewItem::paintCell(p,_cg, column, width, alignment); + KListViewItem::paintCell(p,_cg, column, width, tqalignment); } #include <iostream> @@ -257,7 +257,7 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel) val=i18n("Unlimited"); fullname=keyString[9]; - fp2 = popen(TQFile::encodeName(TQString("gpg --no-tty --with-colons --list-key %1").arg(KShellProcess::quote(id))), "r"); + fp2 = popen(TQFile::encodeName(TQString("gpg --no-tty --with-colons --list-key %1").tqarg(KShellProcess::quote(id))), "r"); bool dead=true; while ( fgets( line, sizeof(line), fp2)) { tst2=TQString::fromUtf8(line); @@ -297,7 +297,7 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel) item=new KListViewItem(keysListpr,keyName,keyMail,id); - //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(trust).arg(val)); + //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").tqarg(id).tqarg(trust).tqarg(val)); KListViewItem *sub= new KListViewItem(item,i18n("Expiration:"),val); sub->setSelectable(false); item->setPixmap(0,keyPair); @@ -434,7 +434,7 @@ KeyView::KeyView( TQWidget *parent, const char *name ) void KeyView::droppedfile (KURL url) { - if (KMessageBox::questionYesNo(this,i18n("<p>Do you want to import file <b>%1</b> into your key ring?</p>").arg(url.path()), TQString(), i18n("Import"), i18n("Do Not Import"))!=KMessageBox::Yes) + if (KMessageBox::questionYesNo(this,i18n("<p>Do you want to import file <b>%1</b> into your key ring?</p>").tqarg(url.path()), TQString(), i18n("Import"), i18n("Do Not Import"))!=KMessageBox::Yes) return; KgpgInterface *importKeyProcess=new KgpgInterface(); @@ -923,7 +923,7 @@ void listKeys::slotAddUid() addUidWidget->enableButtonOK(false); AddUid *keyUid=new AddUid(); addUidWidget->setMainWidget(keyUid); - //keyUid->setMinimumSize(keyUid->sizeHint()); + //keyUid->setMinimumSize(keyUid->tqsizeHint()); keyUid->setMinimumWidth(300); connect(keyUid->kLineEdit1,TQT_SIGNAL(textChanged ( const TQString & )),TQT_TQOBJECT(this),TQT_SLOT(slotAddUidEnable(const TQString & ))); if (addUidWidget->exec()!=TQDialog::Accepted) @@ -966,7 +966,7 @@ void listKeys::slotGpgError(TQString errortxt) void listKeys::slotDeletePhoto() { - if (KMessageBox::warningContinueCancel(this,i18n("<qt>Are you sure you want to delete Photo id <b>%1</b><br>from key <b>%2 <%3></b> ?</qt>").arg(keysList2->currentItem()->text(6)).arg(keysList2->currentItem()->parent()->text(0)).arg(keysList2->currentItem()->parent()->text(1)),i18n("Warning"),KGuiItem(i18n("Delete"),"editdelete"))!=KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this,i18n("<qt>Are you sure you want to delete Photo id <b>%1</b><br>from key <b>%2 <%3></b> ?</qt>").tqarg(keysList2->currentItem()->text(6)).tqarg(keysList2->currentItem()->parent()->text(0)).tqarg(keysList2->currentItem()->parent()->text(1)),i18n("Warning"),KGuiItem(i18n("Delete"),"editdelete"))!=KMessageBox::Continue) return; KgpgInterface *delPhotoProcess=new KgpgInterface(); @@ -1070,7 +1070,7 @@ void listKeys::findFirstKey() keysList2->setSelected(item,true); keysList2->ensureItemVisible(item); } else - KMessageBox::sorry(this,i18n("<qt>Search string '<b>%1</b>' not found.").arg(searchString)); + KMessageBox::sorry(this,i18n("<qt>Search string '<b>%1</b>' not found.").tqarg(searchString)); } void listKeys::findNextKey() @@ -1275,7 +1275,7 @@ void listKeys::readOptions() KGpgSettings::setGroups(groups.join(",")); keysList2->groupNb=groups.count(); if (keyStatusBar) - changeMessage(i18n("%1 Keys, %2 Groups").arg(keysList2->childCount()-keysList2->groupNb).arg(keysList2->groupNb),1); + changeMessage(i18n("%1 Keys, %2 Groups").tqarg(keysList2->childCount()-keysList2->groupNb).tqarg(keysList2->groupNb),1); showTipOfDay= KGpgSettings::showTipOfDay(); } @@ -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->sizeHint()); + keyRevoke->setMinimumSize(keyRevoke->tqsizeHint()); keyRevoke->show(); keyRevokeWidget->setMainWidget(keyRevoke); @@ -1478,7 +1478,7 @@ void listKeys::slotexportsec() p->start(KProcess::Block); if (fgpg.exists()) - KMessageBox::information(this,i18n("Your PRIVATE key \"%1\" was successfully exported.\nDO NOT leave it in an insecure place.").arg(url.path())); + KMessageBox::information(this,i18n("Your PRIVATE key \"%1\" was successfully exported.\nDO NOT leave it in an insecure place.").tqarg(url.path())); else KMessageBox::sorry(this,i18n("Your secret key could not be exported.\nCheck the key.")); } @@ -1553,7 +1553,7 @@ void listKeys::slotexport() p->start(KProcess::Block); if (fgpg.exists()) - KMessageBox::information(this,i18n("Your public key \"%1\" was successfully exported\n").arg(expname)); + KMessageBox::information(this,i18n("Your public key \"%1\" was successfully exported\n").tqarg(expname)); else KMessageBox::sorry(this,i18n("Your public key could not be exported\nCheck the key.")); } @@ -1593,7 +1593,7 @@ void listKeys::slotProcessExportMail(TQString keys) void listKeys::slotProcessExportClip(TQString keys) { - kapp->clipboard()->setText(keys,clipboardMode); + kapp->tqclipboard()->setText(keys,clipboardMode); } @@ -1667,7 +1667,7 @@ void listKeys::deleteGroup() if (!keysList2->currentItem() || !keysList2->currentItem()->text(6).isEmpty()) return; - int result=KMessageBox::warningContinueCancel(this,i18n("<qt>Are you sure you want to delete group <b>%1</b> ?</qt>").arg(keysList2->currentItem()->text(0)),i18n("Warning"),KGuiItem(i18n("Delete"),"editdelete")); + int result=KMessageBox::warningContinueCancel(this,i18n("<qt>Are you sure you want to delete group <b>%1</b> ?</qt>").tqarg(keysList2->currentItem()->text(0)),i18n("Warning"),KGuiItem(i18n("Delete"),"editdelete")); if (result!=KMessageBox::Continue) return; KgpgInterface::delGpgGroup(keysList2->currentItem()->text(0), KGpgSettings::gpgConfigPath()); @@ -1681,7 +1681,7 @@ void listKeys::deleteGroup() TQStringList groups=KgpgInterface::getGpgGroupNames(KGpgSettings::gpgConfigPath()); KGpgSettings::setGroups(groups.join(",")); keysList2->groupNb=groups.count(); - changeMessage(i18n("%1 Keys, %2 Groups").arg(keysList2->childCount()-keysList2->groupNb).arg(keysList2->groupNb),1); + changeMessage(i18n("%1 Keys, %2 Groups").tqarg(keysList2->childCount()-keysList2->groupNb).tqarg(keysList2->groupNb),1); } void listKeys::groupChange() @@ -1737,9 +1737,9 @@ void listKeys::createNewGroup() keysList2->setSelected(newgrp,true); keysList2->ensureItemVisible(newgrp); keysList2->groupNb=groups.count(); - changeMessage(i18n("%1 Keys, %2 Groups").arg(keysList2->childCount()-keysList2->groupNb).arg(keysList2->groupNb),1); + changeMessage(i18n("%1 Keys, %2 Groups").tqarg(keysList2->childCount()-keysList2->groupNb).tqarg(keysList2->groupNb),1); } else - KMessageBox::sorry(this,i18n("<qt>No valid or trusted key was selected. The group <b>%1</b> will not be created.</qt>").arg(groupName)); + KMessageBox::sorry(this,i18n("<qt>No valid or trusted key was selected. The group <b>%1</b> will not be created.</qt>").tqarg(groupName)); } } @@ -1817,7 +1817,7 @@ void listKeys::editGroup() gEdit->groupKeys->setColumnWidthMode(1,TQListView::Manual); gEdit->groupKeys->setColumnWidthMode(2,TQListView::Manual); - gEdit->setMinimumSize(gEdit->sizeHint()); + gEdit->setMinimumSize(gEdit->tqsizeHint()); gEdit->show(); if (dialogGroupEdit->exec()==TQDialog::Accepted) groupChange(); @@ -1864,7 +1864,7 @@ void listKeys::signkey() pclose(pass); opt= i18n("<qt>You are about to sign key:<br><br>%1<br>ID: %2<br>Fingerprint: <br><b>%3</b>.<br><br>" "You should check the key fingerprint by phoning or meeting the key owner to be sure that someone " - "is not trying to intercept your communications</qt>").arg(keysList2->currentItem()->text(0)+" ("+keysList2->currentItem()->text(1)+")").arg(keysList2->currentItem()->text(6)).arg(fingervalue); + "is not trying to intercept your communications</qt>").tqarg(keysList2->currentItem()->text(0)+" ("+keysList2->currentItem()->text(1)+")").tqarg(keysList2->currentItem()->text(6)).tqarg(fingervalue); if (KMessageBox::warningContinueCancel(this,opt)!=KMessageBox::Continue) return; @@ -1958,7 +1958,7 @@ void listKeys::signatureResult(int success) keysList2->refreshcurrentkey(signList.at(keyCount)); else if (success==2) - KMessageBox::sorry(this,i18n("<qt>Bad passphrase, key <b>%1</b> not signed.</qt>").arg(signList.at(keyCount)->text(0)+i18n(" (")+signList.at(keyCount)->text(1)+i18n(")"))); + KMessageBox::sorry(this,i18n("<qt>Bad passphrase, key <b>%1</b> not signed.</qt>").tqarg(signList.at(keyCount)->text(0)+i18n(" (")+signList.at(keyCount)->text(1)+i18n(")"))); keyCount++; signLoop(); @@ -2064,7 +2064,7 @@ void listKeys::delsignkey() KMessageBox::sorry(this,i18n("Edit key manually to delete a self-signature.")); return; } - TQString ask=i18n("<qt>Are you sure you want to delete signature<br><b>%1</b> from key:<br><b>%2</b>?</qt>").arg(signMail).arg(parentMail); + TQString ask=i18n("<qt>Are you sure you want to delete signature<br><b>%1</b> from key:<br><b>%2</b>?</qt>").tqarg(signMail).tqarg(parentMail); if (KMessageBox::questionYesNo(this,ask,TQString(),KStdGuiItem::del(),KStdGuiItem::cancel())!=KMessageBox::Yes) return; @@ -2134,7 +2134,7 @@ void listKeys::slotgenkey() bool goodpass=false; while (!goodpass) { - int code=KPasswordDialog::getNewPassword(password,i18n("<b>Enter passphrase for %1</b>:<br>Passphrase should include non alphanumeric characters and random sequences").arg(newKeyName+" <"+newKeyMail+">")); + int code=KPasswordDialog::getNewPassword(password,i18n("<b>Enter passphrase for %1</b>:<br>Passphrase should include non alphanumeric characters and random sequences").tqarg(newKeyName+" <"+newKeyMail+">")); if (code!=TQDialog::Accepted) return; if (password.length()<5) @@ -2157,7 +2157,7 @@ void listKeys::slotgenkey() TQLabel *tex=new TQLabel(wid); TQLabel *tex2=new TQLabel(wid); - tex->setAlignment(AlignHCenter); + tex->tqsetAlignment(AlignHCenter); tex->setMovie(anim); tex2->setText(i18n("\nPlease wait...")); vbox->addWidget(passiveBox); @@ -2188,27 +2188,27 @@ void listKeys::slotgenkey() { proc->writeStdin(TQString("Key-Type: DSA")); proc->writeStdin(TQString("Subkey-Type: ELG-E")); - proc->writeStdin(TQString("Subkey-Length:%1").arg(ksize)); + proc->writeStdin(TQString("Subkey-Length:%1").tqarg(ksize)); } - proc->writeStdin(TQString("Passphrase:%1").arg(password.data())); - proc->writeStdin(TQString("Key-Length:%1").arg(ksize)); - proc->writeStdin(TQString("Name-Real:%1").arg(newKeyName)); + proc->writeStdin(TQString("Passphrase:%1").tqarg(password.data())); + proc->writeStdin(TQString("Key-Length:%1").tqarg(ksize)); + proc->writeStdin(TQString("Name-Real:%1").tqarg(newKeyName)); if (!newKeyMail.isEmpty()) - proc->writeStdin(TQString("Name-Email:%1").arg(newKeyMail)); + proc->writeStdin(TQString("Name-Email:%1").tqarg(newKeyMail)); if (!kcomment.isEmpty()) - proc->writeStdin(TQString("Name-Comment:%1").arg(kcomment)); + proc->writeStdin(TQString("Name-Comment:%1").tqarg(kcomment)); if (kexp==0) proc->writeStdin(TQString("Expire-Date:0")); if (kexp==1) - proc->writeStdin(TQString("Expire-Date:%1").arg(knumb)); + proc->writeStdin(TQString("Expire-Date:%1").tqarg(knumb)); if (kexp==2) - proc->writeStdin(TQString("Expire-Date:%1w").arg(knumb)); + proc->writeStdin(TQString("Expire-Date:%1w").tqarg(knumb)); if (kexp==3) - proc->writeStdin(TQString("Expire-Date:%1m").arg(knumb)); + proc->writeStdin(TQString("Expire-Date:%1m").tqarg(knumb)); if (kexp==4) - proc->writeStdin(TQString("Expire-Date:%1y").arg(knumb)); + proc->writeStdin(TQString("Expire-Date:%1y").tqarg(knumb)); proc->writeStdin(TQString("%commit")); TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this),TQT_SLOT(readgenprocess(KProcIO *))); proc->closeWhenDone(); @@ -2281,7 +2281,7 @@ void listKeys::newKeyDone(KProcess *) return; } keysList2->refreshcurrentkey(newkeyID); - changeMessage(i18n("%1 Keys, %2 Groups").arg(keysList2->childCount()-keysList2->groupNb).arg(keysList2->groupNb),1); + changeMessage(i18n("%1 Keys, %2 Groups").tqarg(keysList2->childCount()-keysList2->groupNb).tqarg(keysList2->groupNb),1); KDialogBase *keyCreated=new KDialogBase( this, "key_created", true,i18n("New Key Pair Created"), KDialogBase::Ok); newKey *page=new newKey(keyCreated); page->TLname->setText("<b>"+newKeyName+"</b>"); @@ -2294,7 +2294,7 @@ void listKeys::newKeyDone(KProcess *) page->LEfinger->setText(newkeyFinger); page->CBdefault->setChecked(true); page->show(); - //page->resize(page->maximumSize()); + //page->resize(page->tqmaximumSize()); keyCreated->setMainWidget(page); delete pop; keyCreated->exec(); @@ -2326,7 +2326,7 @@ void listKeys::doFilePrint(TQString url) TQTextStream t( &qfile ); doPrint(t.read()); } else - KMessageBox::sorry(this,i18n("<qt>Cannot open file <b>%1</b> for printing...</qt>").arg(url)); + KMessageBox::sorry(this,i18n("<qt>Cannot open file <b>%1</b> for printing...</qt>").tqarg(url)); } void listKeys::doPrint(TQString txt) @@ -2345,7 +2345,7 @@ void listKeys::deleteseckey() //////////////////////// delete a key TQString res=keysList2->currentItem()->text(0)+" ("+keysList2->currentItem()->text(1)+")"; int result=KMessageBox::warningContinueCancel(this, - i18n("<p>Delete <b>SECRET KEY</b> pair <b>%1</b>?</p>Deleting this key pair means you will never be able to decrypt files encrypted with this key again.").arg(res), + i18n("<p>Delete <b>SECRET KEY</b> pair <b>%1</b>?</p>Deleting this key pair means you will never be able to decrypt files encrypted with this key again.").tqarg(res), i18n("Warning"), KGuiItem(i18n("Delete"),"editdelete")); if (result!=KMessageBox::Continue) @@ -2406,7 +2406,7 @@ void listKeys::confirmdeletekey() } if (secretKeyInside) { - int result=KMessageBox::warningContinueCancel(this,i18n("<qt>The following are secret key pairs:<br><b>%1</b>They will not be deleted.<br></qt>").arg(secList)); + int result=KMessageBox::warningContinueCancel(this,i18n("<qt>The following are secret key pairs:<br><b>%1</b>They will not be deleted.<br></qt>").tqarg(secList)); if (result!=KMessageBox::Continue) return; } @@ -2461,7 +2461,7 @@ void listKeys::deletekey() } } else stateChanged("empty_list"); - changeMessage(i18n("%1 Keys, %2 Groups").arg(keysList2->childCount()-keysList2->groupNb).arg(keysList2->groupNb),1); + changeMessage(i18n("%1 Keys, %2 Groups").tqarg(keysList2->childCount()-keysList2->groupNb).tqarg(keysList2->groupNb),1); } @@ -2473,8 +2473,8 @@ void listKeys::slotPreImportKey() dial->setMainWidget(page); page->newFilename->setCaption(i18n("Open File")); page->newFilename->setMode(KFile::File); - page->resize(page->minimumSize()); - dial->resize(dial->minimumSize()); + page->resize(page->tqminimumSize()); + dial->resize(dial->tqminimumSize()); if (dial->exec()==TQDialog::Accepted) { if (page->checkFile->isChecked()) { @@ -2488,7 +2488,7 @@ void listKeys::slotPreImportKey() connect(importKeyProcess,TQT_SIGNAL(refreshOrphaned()),keysList2,TQT_SLOT(slotReloadOrphaned())); } } else { - TQString keystr = kapp->clipboard()->text(clipboardMode); + TQString keystr = kapp->tqclipboard()->text(clipboardMode); if (!keystr.isEmpty()) { changeMessage(i18n("Importing..."),0,true); KgpgInterface *importKeyProcess=new KgpgInterface(); @@ -2638,7 +2638,7 @@ void KeyView::expandKey(TQListViewItem *item) } else if (tst[0]=="sub") { gpgKey subKey=extractKey(line); - itemsub= new UpdateViewItem(item,i18n("%1 subkey").arg(subKey.gpgkeyalgo),TQString(),TQString(),subKey.gpgkeyexpiration,subKey.gpgkeysize,subKey.gpgkeycreation,subKey.gpgkeyid); + itemsub= new UpdateViewItem(item,i18n("%1 subkey").tqarg(subKey.gpgkeyalgo),TQString(),TQString(),subKey.gpgkeyexpiration,subKey.gpgkeysize,subKey.gpgkeycreation,subKey.gpgkeyid); itemsub->setPixmap(0,pixkeySingle); itemsub->setPixmap(2,subKey.trustpic); cycle="sub"; @@ -2768,7 +2768,7 @@ void KeyView::refreshkeylist() setSelected(firstChild(),true); } - emit statusMessage(i18n("%1 Keys, %2 Groups").arg(childCount()-groupNb).arg(groupNb),1); + emit statusMessage(i18n("%1 Keys, %2 Groups").tqarg(childCount()-groupNb).tqarg(groupNb),1); emit statusMessage(i18n("Ready"),0); kdDebug(2100)<<"Refresh Finished"<<endl; } @@ -2855,7 +2855,7 @@ void KeyView::refreshgroups() item->setPixmap(0,pixkeyGroup); item->setExpandable(false); } - emit statusMessage(i18n("%1 Keys, %2 Groups").arg(childCount()-groupNb).arg(groupNb),1); + emit statusMessage(i18n("%1 Keys, %2 Groups").tqarg(childCount()-groupNb).tqarg(groupNb),1); emit statusMessage(i18n("Ready"),0); } @@ -2882,7 +2882,7 @@ void KeyView::slotReloadKeys(TQStringList keyIDs) } kdDebug(2100)<<"Refreshing key:--------"<<TQString((keyIDs.last()).right(8).prepend("0x"))<<endl; ensureItemVisible(this->findItem((keyIDs.last()).right(8).prepend("0x"),6)); - emit statusMessage(i18n("%1 Keys, %2 Groups").arg(childCount()-groupNb).arg(groupNb),1); + emit statusMessage(i18n("%1 Keys, %2 Groups").tqarg(childCount()-groupNb).tqarg(groupNb),1); emit statusMessage(i18n("Ready"),0); } @@ -2917,7 +2917,7 @@ void KeyView::slotReloadOrphaned() } } setSelected(findItem(*it,6),true); - emit statusMessage(i18n("%1 Keys, %2 Groups").arg(childCount()-groupNb).arg(groupNb),1); + emit statusMessage(i18n("%1 Keys, %2 Groups").tqarg(childCount()-groupNb).tqarg(groupNb),1); emit statusMessage(i18n("Ready"),0); } diff --git a/kgpg/listkeys.h b/kgpg/listkeys.h index 00de748..abb2689 100644 --- a/kgpg/listkeys.h +++ b/kgpg/listkeys.h @@ -24,7 +24,7 @@ #include <klistviewsearchline.h> #include <kactionclasses.h> -#include <clipboard.h> +#include <tqclipboard.h> #include "dcopiface.h" diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index 8bfe665..0800823 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ //////////////////////////////////////////////////////// code for choosing a public key from a list for encryption -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqptrlist.h> #include <tqwhatsthis.h> @@ -26,7 +26,7 @@ #include <tqcheckbox.h> #include <tqhbuttongroup.h> #include <tqtoolbutton.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tdeversion.h> #include <klistview.h> @@ -70,14 +70,14 @@ def=isDefault; } -void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int alignment) +void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column, int width, int tqalignment) { if ((def) && (column<2)) { TQFont font(p->font()); font.setBold(true); p->setFont(font); } - KListViewItem::paintCell(p, cg, column, width, alignment); + KListViewItem::paintCell(p, cg, column, width, tqalignment); } TQString UpdateViewItem2 :: key(int c,bool ) const @@ -106,7 +106,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20); keyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20); - if (filemode) setCaption(i18n("Select Public Key for %1").arg(sfile)); + if (filemode) setCaption(i18n("Select Public Key for %1").tqarg(sfile)); fmode=filemode; TQHButtonGroup *hBar=new TQHButtonGroup(page); @@ -176,7 +176,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent (CBshred,i18n("<b>Shred source file</b>: permanently remove source file. No recovery will be possible")); TQString shredWhatsThis = i18n( "<qt><b>Shred source file:</b><br /><p>Checking this option will shred (overwrite several times before erasing) the files you have encrypted. This way, it is almost impossible that the source file is recovered.</p><p><b>But you must be aware that this is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>"); - KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").arg(shredWhatsThis),parentBox ); + KActiveLabel *warn= new KActiveLabel( i18n("<a href=\"whatsthis:%1\">Read this before using shredding</a>").tqarg(shredWhatsThis),parentBox ); shredBox->addWidget(CBshred); shredBox->addWidget(warn); } @@ -431,7 +431,7 @@ void popupPublic::slotprocread(KProcIO *p) bool isDefaultKey=false; if (id.right(8)==defaultKey) isDefaultKey=true; UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey); - //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val)); + //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").tqarg(id).tqarg(tr).tqarg(val)); //sub->setSelectable(false); if (seclist.find(tst,0,FALSE)!=-1) item->setPixmap(0,keyPair); diff --git a/kgpg/sourceselect.ui b/kgpg/sourceselect.ui index b974eb7..1d0b749 100644 --- a/kgpg/sourceselect.ui +++ b/kgpg/sourceselect.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>350</width> <height>0</height> @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cc index 14c81c1..7e7f14c 100644 --- a/khexedit/bitswapwidget.cc +++ b/khexedit/bitswapwidget.cc @@ -81,7 +81,7 @@ void CDigitLabel::setDotPosition( uint dotPosition ) -TQSize CDigitLabel::sizeHint( void ) const +TQSize CDigitLabel::tqsizeHint( void ) const { int h = fontMetrics().height(); TQSize s( h, h ); // Retangular @@ -98,13 +98,13 @@ void CDigitLabel::drawContents( TQPainter *p ) if( hasFocus() == true ) { - p->fillRect( cr, palette().active().highlight() ); - p->setPen( palette().active().highlightedText() ); + p->fillRect( cr, tqpalette().active().highlight() ); + p->setPen( tqpalette().active().highlightedText() ); } else { - p->fillRect( cr, palette().active().base() ); - p->setPen( palette().active().text() ); + p->fillRect( cr, tqpalette().active().base() ); + p->setPen( tqpalette().active().text() ); } if( mDotPosition != 0 ) @@ -132,7 +132,7 @@ void CDigitLabel::drawContents( TQPainter *p ) TQString text; text.setNum( mDigit ); - p->drawText( 0, 0, cr.width(), cr.height(), alignment(), text ); + p->drawText( 0, 0, cr.width(), cr.height(), tqalignment(), text ); @@ -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]->sizeHint()*2 ); + mDigit[i]->setFixedSize( mDigit[i]->tqsizeHint()*2 ); mDigit[i]->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - mDigit[i]->setAlignment( AlignCenter ); + mDigit[i]->tqsetAlignment( 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 51a582f..0dfccbf 100644 --- a/khexedit/bitswapwidget.h +++ b/khexedit/bitswapwidget.h @@ -22,7 +22,7 @@ #define _BITSWAP_WIDGET_H_ #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqstring.h> @@ -35,7 +35,7 @@ class CDigitLabel : public TQLabel CDigitLabel( TQWidget *parent, uint digit = 0, const char *name=0 ); ~CDigitLabel( void ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; inline uint value( void ); signals: diff --git a/khexedit/chartabledialog.cc b/khexedit/chartabledialog.cc index b0cb49b..4475604 100644 --- a/khexedit/chartabledialog.cc +++ b/khexedit/chartabledialog.cc @@ -22,7 +22,7 @@ #include <tqlabel.h> #include <tqheader.h> -#include <layout.h> +#include <tqlayout.h> #include <tqspinbox.h> #include <kglobalsettings.h> @@ -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->sizeHint().width() ); + label->setFixedWidth( label->tqsizeHint().width() ); hbox->addWidget( label ); mInputCountSpin = new TQSpinBox( plainPage(), "spin" ); diff --git a/khexedit/converterdialog.cc b/khexedit/converterdialog.cc index e9b1732..6f3a82e 100644 --- a/khexedit/converterdialog.cc +++ b/khexedit/converterdialog.cc @@ -20,7 +20,7 @@ #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc index a598b04..e04bb30 100644 --- a/khexedit/dialog.cc +++ b/khexedit/dialog.cc @@ -24,7 +24,7 @@ #include <tqbuttongroup.h> #include <tqfileinfo.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvalidator.h> #include <kfiledialog.h> @@ -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->sizeHint().height() ); + label->setFixedHeight( label->tqsizeHint().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->sizeHint().height() ); + label->setFixedHeight( label->tqsizeHint().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->sizeHint().height()); + mOperandSelector->setFixedHeight( mOperandSelector->tqsizeHint().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->sizeHint().height() ); + label->setFixedHeight( label->tqsizeHint().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->sizeHint().height() ); + resetButton->setFixedHeight( resetButton->tqsizeHint().height() ); connect( resetButton, TQT_SIGNAL(clicked()), mByteWidget, TQT_SLOT(reset()) ); hbox->addWidget( resetButton ); @@ -1237,7 +1237,7 @@ void centerDialog( TQWidget *widget, TQWidget *centerParent ) } TQPoint point = centerParent->mapToGlobal( TQPoint(0,0) ); - TQRect pos = centerParent->geometry(); + TQRect pos = centerParent->tqgeometry(); widget->setGeometry( point.x() + pos.width()/2 - widget->width()/2, point.y() + pos.height()/2 - widget->height()/2, @@ -1253,7 +1253,7 @@ void centerDialogBottom( TQWidget *widget, TQWidget *centerParent ) } TQPoint point = centerParent->mapToGlobal( TQPoint(0,0) ); - TQRect pos = centerParent->geometry(); + TQRect pos = centerParent->tqgeometry(); widget->setGeometry( point.x() + pos.width()/2 - widget->width()/2, point.y() + pos.height() - widget->height(), diff --git a/khexedit/exportdialog.cc b/khexedit/exportdialog.cc index 612c245..d5b90e1 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->sizeHint() ); + radio1->setFixedSize( radio1->tqsizeHint() ); mDestination.rangeBox->insert( radio1, 0 ); vbox->addWidget( radio1, 0, AlignLeft ); TQRadioButton *radio2 = new TQRadioButton( i18n("&Selection"), group ); - radio2->setFixedSize( radio2->sizeHint() ); + radio2->setFixedSize( radio2->tqsizeHint() ); mDestination.rangeBox->insert( radio2, 1 ); vbox->addWidget( radio2, 0, AlignLeft ); TQRadioButton *radio3 = new TQRadioButton( i18n("&Range"), group ); - radio3->setFixedSize( radio3->sizeHint() ); + radio3->setFixedSize( radio3->tqsizeHint() ); 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->sizeHint(); + TQSize size = mOptionStack->tqsizeHint(); 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, topLevelWidget() ); + url = KFileDialog::getExistingDirectory( mWorkDir, tqtopLevelWidget() ); } else { - url = KFileDialog::getSaveFileName( mWorkDir, "*", topLevelWidget() ); + url = KFileDialog::getSaveFileName( mWorkDir, "*", tqtopLevelWidget() ); } if( url.isEmpty() ) @@ -673,14 +673,14 @@ bool CExportDialog::verifyPackage( const TQString &path ) } const TQString prefix = mHtml.prefixInput->text(); - TQString f1 = TQString("%1%2.html").arg(prefix).arg("00000000"); - TQString f2 = TQString("%1%2.html").arg(prefix).arg("99999999"); + TQString f1 = TQString("%1%2.html").tqarg(prefix).tqarg("00000000"); + TQString f2 = TQString("%1%2.html").tqarg(prefix).tqarg("99999999"); TQString msg = i18n( "" "You have specified an existing folder.\n" "If you continue, any existing file in the range " "\"%1\" to \"%2\" can be lost.\n" - "Continue?").arg(f1).arg(f2); + "Continue?").tqarg(f1).tqarg(f2); int reply = KMessageBox::warningContinueCancel( this, msg, title ); if( reply != KMessageBox::Continue ) { diff --git a/khexedit/fileinfodialog.cc b/khexedit/fileinfodialog.cc index 502eedb..957f1d7 100644 --- a/khexedit/fileinfodialog.cc +++ b/khexedit/fileinfodialog.cc @@ -20,7 +20,7 @@ #include <tqheader.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <kglobalsettings.h> #include <kglobal.h> @@ -239,13 +239,13 @@ void CFileInfoDialog::setStatistics( SStatisticControl &sc ) o.sprintf("%03o", i ); b.sprintf("%s", printBin(i) ); - n = TQString("%1").arg( sc.occurrence[i], pre ); + n = TQString("%1").tqarg( sc.occurrence[i], pre ); if( sc.documentSize == 0 ) p = "0.00"; else { double val = 100.0*((double)sc.occurrence[i]/(double)sc.documentSize); - p = TQString("%1").arg( val, 6, 'f', 2 ); + p = TQString("%1").tqarg( val, 6, 'f', 2 ); } const TQChar _i((char)i); diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc index e6a5532..dcfdd91 100644 --- a/khexedit/hexbuffer.cc +++ b/khexedit/hexbuffer.cc @@ -447,8 +447,8 @@ TQString SExportCArray::variableName( uint range ) const uint es = elementSize(); uint numElement = range / es + ((range % es) ? 1 : 0); - return( TQString("%1 %2[%2]").arg(typeString[elementType]). - arg(arrayName).arg(numElement) ); + return( TQString("%1 %2[%2]").tqarg(typeString[elementType]). + tqarg(arrayName).tqarg(numElement) ); } @@ -580,9 +580,9 @@ bool CHexBuffer::hasFileName( void ) -int CHexBuffer::setLayout( SDisplayLayout &layout ) +int CHexBuffer::setLayout( SDisplayLayout &tqlayout ) { - mLayout = layout; + mLayout = tqlayout; mLayout.verify(); if( mLayout.primaryMode == SDisplayLayout::textOnly ) @@ -676,7 +676,7 @@ bool CHexBuffer::toggleEditor( void ) edit_secondary : edit_primary; } - setEditMode( mEditMode ); // Sets the cursor shapes as well + setEditMode( mEditMode ); // Sets the cursor tqshapes as well if( changed == true ) { @@ -766,7 +766,7 @@ void CHexBuffer::setDisableCursor( bool disableCursor ) } -void CHexBuffer::setCursorShapeModifier( bool alwaysBlock, bool thickInsert ) +void CHexBuffer::settqCursorShapeModifier( bool alwaysBlock, bool thickInsert ) { mCursor.setShapeModifier( alwaysBlock, thickInsert ); setEditMode( mEditMode ); @@ -813,12 +813,12 @@ void CHexBuffer::setEditMode( EEditMode editMode ) -void CHexBuffer::setMaximumSize( uint maximumSize ) +void CHexBuffer::setMaximumSize( uint tqmaximumSize ) { - if( maximumSize == 0 ) { maximumSize = ~0; } + if( tqmaximumSize == 0 ) { tqmaximumSize = ~0; } - mMaximumSize = maximumSize; - mFixedSizeMode = maximumSize == (uint)~0 ? false : true; + mMaximumSize = tqmaximumSize; + mFixedSizeMode = tqmaximumSize == (uint)~0 ? false : true; mCursor.setFixedSizeMode( mFixedSizeMode ); if( mLayout.offsetVisible == false ) @@ -832,9 +832,9 @@ void CHexBuffer::setMaximumSize( uint maximumSize ) if( mLayout.offsetMode == SDisplayLayout::decimal ) { printOffset = &CHexBuffer::printDecimalOffset; - for( mOffsetSize=0; maximumSize > 0; mOffsetSize += 1 ) + for( mOffsetSize=0; tqmaximumSize > 0; mOffsetSize += 1 ) { - maximumSize = maximumSize / 10; + tqmaximumSize = tqmaximumSize / 10; } mOffsetIndex = 10 - mOffsetSize; } @@ -848,9 +848,9 @@ void CHexBuffer::setMaximumSize( uint maximumSize ) { printOffset = &CHexBuffer::printHexadecimalSmallOffset; } - for( mOffsetSize=0; maximumSize > 0; mOffsetSize += 1 ) + for( mOffsetSize=0; tqmaximumSize > 0; mOffsetSize += 1 ) { - maximumSize = maximumSize / 16; + tqmaximumSize = tqmaximumSize / 16; } if( mOffsetSize > 4 ) { mOffsetSize += 1; } // Space for the ':' sign mOffsetIndex = 9 - mOffsetSize; @@ -952,7 +952,7 @@ int CHexBuffer::writeFile( TQFile &file, CProgress &p ) int CHexBuffer::readFile( TQFile &file, const TQString &url, CProgress &p ) { - if( resize( file.size() + 100 ) == false ) + if( tqresize( file.size() + 100 ) == false ) { p.finish(); return( Err_NoMemory ); @@ -1064,7 +1064,7 @@ int CHexBuffer::insertFile( TQFile &file, CProgress &p ) int CHexBuffer::newFile( const TQString &url ) { - if( resize( 100 ) == 0 ) + if( tqresize( 100 ) == 0 ) { return( Err_NoMemory ); } @@ -1923,8 +1923,8 @@ void CHexBuffer::drawHeader( TQPainter &paint, int sx, int width, int y, else if( header.pos[i] == SPageHeader::PageNumber ) { msg = i18n("Page %1 of %2") - .arg(KGlobal::locale()->formatNumber(position.curPage, 0)) - .arg(KGlobal::locale()->formatNumber(position.maxPage, 0)); + .tqarg(KGlobal::locale()->formatNumber(position.curPage, 0)) + .tqarg(KGlobal::locale()->formatNumber(position.maxPage, 0)); } else if( header.pos[i] == SPageHeader::FileName ) { @@ -2091,7 +2091,7 @@ void CHexBuffer::drawCursor( TQPainter &paint, uint line, int startx, } // - // Draw the cursor shape + // Draw the cursor tqshape // bool transparent = false; if( mActiveEditor == edit_primary ) @@ -2116,7 +2116,7 @@ void CHexBuffer::drawCursor( TQPainter &paint, uint line, int startx, paint.drawLine( center-2, mFontHeight-1, center+2, mFontHeight-1 ); } } - else // Solid block shape + else // Solid block tqshape { paint.fillRect( c.x1 - startx, 0, mUnitWidth, mFontHeight, cbg ); useFg = true; @@ -2209,7 +2209,7 @@ void CHexBuffer::drawCursor( TQPainter &paint, uint line, int startx, } // - // Draw the cursor shape + // Draw the cursor tqshape // transparent = false; if( mActiveEditor == edit_secondary ) @@ -2822,16 +2822,16 @@ int CHexBuffer::exportHtml( const SExportHtml &ex, CProgress &p ) for( uint i=0; i < numFiles; i++ ) { name.sprintf( "%08d.html", i+1 ); - fileNames.append( TQString("%1/%2%3").arg(ex.package).arg(ex.prefix). + fileNames.append( TQString("%1/%2%3").tqarg(ex.package).tqarg(ex.prefix). arg(name)); } name.sprintf( "%08d.html", 0 ); - TQString tocName =TQString("%1/%2%3").arg(ex.package).arg(ex.prefix).arg(name); + TQString tocName =TQString("%1/%2%3").tqarg(ex.package).tqarg(ex.prefix).tqarg(name); TQString linkName; if( ex.symLink == true ) { - linkName = TQString("%1/%2").arg(ex.package).arg("index.html"); + linkName = TQString("%1/%2").tqarg(ex.package).tqarg("index.html"); } while( remaining > 0 ) @@ -2849,7 +2849,7 @@ int CHexBuffer::exportHtml( const SExportHtml &ex, CProgress &p ) THIS_FPTR(printOffset)( mPrintBuf, (startLine-1)*mLayout.lineSize ); mPrintBuf[mOffsetSize]=0; - offset += TQString(" %1 [%2]").arg(i18n("to")).arg(mPrintBuf); + offset += TQString(" %1 [%2]").tqarg(i18n("to")).tqarg(mPrintBuf); offsets.append(offset); if( p.expired() == true ) @@ -2981,7 +2981,7 @@ int CHexBuffer::copyText( TQByteArray &array, const SExportRange &range, uint bytePerLine = mOffsetSize + 1 + (mNumCell + 2)*mLayout.lineSize + 1; uint size = (stopLine - startLine + 1)*bytePerLine; - if( array.resize( size+1 ) == false ) + if( array.tqresize( size+1 ) == false ) { return( Err_NoMemory ); } @@ -3021,7 +3021,7 @@ int CHexBuffer::copySelectedData( TQByteArray &array ) } uint size = stop - start; - if( array.resize( size ) == false ) + if( array.tqresize( size ) == false ) { return( Err_NoMemory ); } @@ -4829,7 +4829,7 @@ void CHexBuffer::printHtmlCaption( TQTextStream &os, uint captionType, break; case 3: - caption = i18n("Page %1 of %2").arg(curPage).arg(numPage); + caption = i18n("Page %1 of %2").tqarg(curPage).tqarg(numPage); break; } diff --git a/khexedit/hexbuffer.h b/khexedit/hexbuffer.h index a236f44..2955af0 100644 --- a/khexedit/hexbuffer.h +++ b/khexedit/hexbuffer.h @@ -35,7 +35,7 @@ #include <tqptrlist.h> #include <tqpainter.h> #include <tqstring.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kapplication.h> @@ -1072,7 +1072,7 @@ class CHexBuffer : public TQByteArray CHexBuffer( void ); ~CHexBuffer( void ); - int setLayout( SDisplayLayout &layout ); + int setLayout( SDisplayLayout &tqlayout ); void setColor( SDisplayColor &color ); void setInputMode( SDisplayInputMode &mode ); bool toggleEditor( void ); @@ -1082,7 +1082,7 @@ class CHexBuffer : public TQByteArray void setNonPrintChar( TQChar nonPrintChar ); void setShowCursor( bool showCursor ); void setDisableCursor( bool disableCursor ); - void setCursorShapeModifier( bool alwaysBlock, bool thickInsert ); + void settqCursorShapeModifier( bool alwaysBlock, bool thickInsert ); void setEditMode( EEditMode editMode ); void setEditMode( EEditMode editMode, bool alwaysBlock, bool thickInsert ); void setMaximumSize( uint size ); @@ -1156,7 +1156,7 @@ class CHexBuffer : public TQByteArray inline SCursorState &cursorState( void ); inline void valueOnCursor( TQByteArray &buf, uint size ); inline SFileState &fileState( void ); - inline const SDisplayLayout &layout( void ); + inline const SDisplayLayout &tqlayout( void ); inline const SDisplayInputMode &inputMode( void ); inline TQPtrList<SCursorOffset> &bookmarkList( void ); @@ -1417,7 +1417,7 @@ inline void CHexBuffer::valueOnCursor( TQByteArray &buf, uint size ) } -inline const SDisplayLayout &CHexBuffer::layout( void ) +inline const SDisplayLayout &CHexBuffer::tqlayout( void ) { return( mLayout ); } diff --git a/khexedit/hexdrag.cc b/khexedit/hexdrag.cc index 1c9e234..0347129 100644 --- a/khexedit/hexdrag.cc +++ b/khexedit/hexdrag.cc @@ -75,7 +75,7 @@ const char *CHexDrag::format( int i ) const } -TQByteArray CHexDrag::encodedData( const char *fmt ) const +TQByteArray CHexDrag::tqencodedData( 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->encodedData(mediaString); + dest = e->tqencodedData(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->encodedData(mediaString); + dest = e->tqencodedData(mediaString); return( true ); } else diff --git a/khexedit/hexdrag.h b/khexedit/hexdrag.h index 7d4fd26..aef2e01 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 encodedData( const char *fmt ) const; + TQByteArray tqencodedData( const char *fmt ) const; static bool canDecode( const TQMimeSource *e ); diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc index 894b70f..6235e09 100644 --- a/khexedit/hexeditorwidget.cc +++ b/khexedit/hexeditorwidget.cc @@ -72,7 +72,7 @@ CHexEditorWidget::CHexEditorWidget( TQWidget *parent, const char *name ) this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); mHexView->setFocus(); - setBackgroundColor( palette().active().base() ); + setBackgroundColor( tqpalette().active().base() ); mProgressBusy = false; mGotoDialog = 0; @@ -115,7 +115,7 @@ void CHexEditorWidget::initialize( void ) setFont( mDisplayState.font ); mHexView->setMisc( mDisplayState.misc ); mHexView->setCursor( mDisplayState.cursor, false ); - mHexView->setLayout( mDisplayState.layout ); + mHexView->setLayout( mDisplayState.tqlayout ); mHexView->setInputMode( mDisplayState.input ); mHexView->setInsertMode( mDisplayState.misc.insertMode ); } @@ -123,25 +123,25 @@ void CHexEditorWidget::initialize( void ) void CHexEditorWidget::writeConfiguration( KConfig &config ) { - SDisplayLayout &layout = mDisplayState.layout; + SDisplayLayout &tqlayout = mDisplayState.tqlayout; config.setGroup( "Display Options" ); - config.writeEntry( "PrimaryMode", layout.primaryModeString() ); - config.writeEntry( "SecondaryMode", layout.secondaryModeString() ); - config.writeEntry( "OffsetMode", layout.offsetModeString() ); - config.writeEntry( "OffsetVisible", layout.offsetVisible ); - config.writeEntry( "PrimaryUpperCase", layout.primaryUpperCase ); - config.writeEntry( "OffsetUpperCase", layout.offsetUpperCase ); - config.writeEntry( "LineSize", layout.lineSize ); - config.writeEntry( "ColumnSize", layout.columnSize ); - config.writeEntry( "LockLine", layout.lockLine ); - config.writeEntry( "LockColumn", layout.lockColumn ); - config.writeEntry( "ColumnCharSpace", layout.columnCharSpace ); - config.writeEntry( "ColumnSpacing", layout.columnSpacing ); - config.writeEntry( "SeparatorMarginWidth", layout.separatorMarginWidth ); - config.writeEntry( "EdgeMarginWidth", layout.edgeMarginWidth ); - config.writeEntry( "LeftSeparatorWidth", layout.leftSeparatorWidth ); - config.writeEntry( "RightSeparatorWidth", layout.rightSeparatorWidth ); - config.writeEntry( "GridMode", layout.gridModeString() ); + config.writeEntry( "PrimaryMode", tqlayout.primaryModeString() ); + config.writeEntry( "SecondaryMode", tqlayout.secondaryModeString() ); + config.writeEntry( "OffsetMode", tqlayout.offsetModeString() ); + config.writeEntry( "OffsetVisible", tqlayout.offsetVisible ); + config.writeEntry( "PrimaryUpperCase", tqlayout.primaryUpperCase ); + config.writeEntry( "OffsetUpperCase", tqlayout.offsetUpperCase ); + config.writeEntry( "LineSize", tqlayout.lineSize ); + config.writeEntry( "ColumnSize", tqlayout.columnSize ); + config.writeEntry( "LockLine", tqlayout.lockLine ); + config.writeEntry( "LockColumn", tqlayout.lockColumn ); + config.writeEntry( "ColumnCharSpace", tqlayout.columnCharSpace ); + config.writeEntry( "ColumnSpacing", tqlayout.columnSpacing ); + config.writeEntry( "SeparatorMarginWidth", tqlayout.separatorMarginWidth ); + config.writeEntry( "EdgeMarginWidth", tqlayout.edgeMarginWidth ); + config.writeEntry( "LeftSeparatorWidth", tqlayout.leftSeparatorWidth ); + config.writeEntry( "RightSeparatorWidth", tqlayout.rightSeparatorWidth ); + config.writeEntry( "GridMode", tqlayout.gridModeString() ); SDisplayLine &line = mDisplayState.line; config.setGroup( "Line Size" ); @@ -183,7 +183,7 @@ void CHexEditorWidget::writeConfiguration( KConfig &config ) config.setGroup( "Display Font" ); config.writeEntry( "UseSystemFont", font.useSystemFont ); config.writeEntry( "LocalFont", font.localFont ); - config.writeEntry( "NonPrintChar", font.nonPrintChar.unicode() ); + config.writeEntry( "NonPrintChar", font.nonPrintChar.tqunicode() ); SDisplayCursor &cursor = mDisplayState.cursor; config.setGroup( "Display Cursor" ); @@ -221,38 +221,38 @@ void CHexEditorWidget::writeConfiguration( KConfig &config ) void CHexEditorWidget::readConfiguration( KConfig &config ) { - SDisplayLayout &layout = mDisplayState.layout; + SDisplayLayout &tqlayout = mDisplayState.tqlayout; config.setGroup( "Display Options" ); - layout.setPrimaryMode( config.readEntry("PrimaryMode") ); - layout.setSecondaryMode( config.readEntry("SecondaryMode") ); - layout.setOffsetMode( config.readEntry("OffsetMode") ); - layout.offsetVisible = config.readBoolEntry( - "OffsetVisible", layout.offsetVisible ); - layout.primaryUpperCase = config.readBoolEntry( - "PrimaryUpperCase", layout.primaryUpperCase ); - layout.offsetUpperCase = config.readBoolEntry( - "OffsetUpperCase", layout.offsetUpperCase ); - layout.lineSize = config.readNumEntry( - "LineSize", layout.lineSize ); - layout.columnSize = config.readNumEntry( - "ColumnSize", layout.columnSize ); - layout.lockLine = config.readBoolEntry( - "LockLine", layout.lockLine ); - layout.lockColumn = config.readBoolEntry( - "LockColumn", layout.lockColumn ); - layout.columnCharSpace = config.readBoolEntry( - "ColumnCharSpace", layout.columnCharSpace ); - layout.columnSpacing = config.readNumEntry( - "ColumnSpacing", layout.columnSpacing ); - layout.separatorMarginWidth = config.readNumEntry( - "SeparatorMarginWidth", layout.separatorMarginWidth ); - layout.edgeMarginWidth = config.readNumEntry( - "EdgeMarginWidth", layout.edgeMarginWidth ); - layout.leftSeparatorWidth = config.readNumEntry( - "LeftSeparatorWidth", layout.leftSeparatorWidth ); - layout.rightSeparatorWidth = config.readNumEntry( - "RightSeparatorWidth", layout.rightSeparatorWidth ); - layout.setGridMode( config.readEntry("GridMode") ); + tqlayout.setPrimaryMode( config.readEntry("PrimaryMode") ); + tqlayout.setSecondaryMode( config.readEntry("SecondaryMode") ); + tqlayout.setOffsetMode( config.readEntry("OffsetMode") ); + tqlayout.offsetVisible = config.readBoolEntry( + "OffsetVisible", tqlayout.offsetVisible ); + tqlayout.primaryUpperCase = config.readBoolEntry( + "PrimaryUpperCase", tqlayout.primaryUpperCase ); + tqlayout.offsetUpperCase = config.readBoolEntry( + "OffsetUpperCase", tqlayout.offsetUpperCase ); + tqlayout.lineSize = config.readNumEntry( + "LineSize", tqlayout.lineSize ); + tqlayout.columnSize = config.readNumEntry( + "ColumnSize", tqlayout.columnSize ); + tqlayout.lockLine = config.readBoolEntry( + "LockLine", tqlayout.lockLine ); + tqlayout.lockColumn = config.readBoolEntry( + "LockColumn", tqlayout.lockColumn ); + tqlayout.columnCharSpace = config.readBoolEntry( + "ColumnCharSpace", tqlayout.columnCharSpace ); + tqlayout.columnSpacing = config.readNumEntry( + "ColumnSpacing", tqlayout.columnSpacing ); + tqlayout.separatorMarginWidth = config.readNumEntry( + "SeparatorMarginWidth", tqlayout.separatorMarginWidth ); + tqlayout.edgeMarginWidth = config.readNumEntry( + "EdgeMarginWidth", tqlayout.edgeMarginWidth ); + tqlayout.leftSeparatorWidth = config.readNumEntry( + "LeftSeparatorWidth", tqlayout.leftSeparatorWidth ); + tqlayout.rightSeparatorWidth = config.readNumEntry( + "RightSeparatorWidth", tqlayout.rightSeparatorWidth ); + tqlayout.setGridMode( config.readEntry("GridMode") ); SDisplayLine &line = mDisplayState.line; config.setGroup( "Line Size" ); @@ -398,9 +398,9 @@ void CHexEditorWidget::paletteChanged( void ) setColor( mDisplayState.color ); } -void CHexEditorWidget::layoutChanged( const SDisplayLayout &/*layout*/ ) +void CHexEditorWidget::layoutChanged( const SDisplayLayout &/*tqlayout*/ ) { - //mDisplayState.layout = layout; + //mDisplayState.tqlayout = tqlayout; } void CHexEditorWidget::inputModeChanged( const SDisplayInputMode &input ) @@ -414,30 +414,30 @@ void CHexEditorWidget::setLineSize(const SDisplayLine &line ) mDisplayState.line = line; } -void CHexEditorWidget::setLayout( const SDisplayLayout &layout ) +void CHexEditorWidget::setLayout( const SDisplayLayout &tqlayout ) { // // We only set the values that can be modified by the dialog // - mDisplayState.layout.lockLine = layout.lockLine; - mDisplayState.layout.lockColumn = layout.lockColumn; - mDisplayState.layout.leftSeparatorWidth = layout.leftSeparatorWidth; - mDisplayState.layout.rightSeparatorWidth = layout.rightSeparatorWidth; - mDisplayState.layout.separatorMarginWidth = layout.separatorMarginWidth; - mDisplayState.layout.edgeMarginWidth = layout.edgeMarginWidth; - mDisplayState.layout.columnCharSpace = layout.columnCharSpace; - mDisplayState.layout.columnSpacing = layout.columnSpacing; - mDisplayState.layout.horzGridWidth = layout.horzGridWidth; - mDisplayState.layout.vertGridWidth = layout.vertGridWidth; + mDisplayState.tqlayout.lockLine = tqlayout.lockLine; + mDisplayState.tqlayout.lockColumn = tqlayout.lockColumn; + mDisplayState.tqlayout.leftSeparatorWidth = tqlayout.leftSeparatorWidth; + mDisplayState.tqlayout.rightSeparatorWidth = tqlayout.rightSeparatorWidth; + mDisplayState.tqlayout.separatorMarginWidth = tqlayout.separatorMarginWidth; + mDisplayState.tqlayout.edgeMarginWidth = tqlayout.edgeMarginWidth; + mDisplayState.tqlayout.columnCharSpace = tqlayout.columnCharSpace; + mDisplayState.tqlayout.columnSpacing = tqlayout.columnSpacing; + mDisplayState.tqlayout.horzGridWidth = tqlayout.horzGridWidth; + mDisplayState.tqlayout.vertGridWidth = tqlayout.vertGridWidth; // // Select the line and column sizes we shall use now. // - SDisplayLayout &l = mDisplayState.layout; + SDisplayLayout &l = mDisplayState.tqlayout; l.lineSize = mDisplayState.line.lineSize[ l.primaryMode ]; l.columnSize = mDisplayState.line.columnSize[ l.primaryMode ]; - mHexView->setLayout( mDisplayState.layout ); + mHexView->setLayout( mDisplayState.tqlayout ); } void CHexEditorWidget::setCursor( const SDisplayCursor &cursor ) @@ -453,26 +453,26 @@ void CHexEditorWidget::setColor( const SDisplayColor &color ) // // The selection colors can not be chosen. // - mDisplayState.color.selectBg = kapp->palette().active().highlight(); - mDisplayState.color.selectFg = kapp->palette().active().highlightedText(); + mDisplayState.color.selectBg = kapp->tqpalette().active().highlight(); + mDisplayState.color.selectFg = kapp->tqpalette().active().highlightedText(); if( mDisplayState.color.useSystemColor == true ) { SDisplayColor c = mDisplayState.color; - c.textBg = kapp->palette().active().base(); - c.secondTextBg = kapp->palette().active().base(); - c.offsetBg = kapp->palette().active().base(); - c.inactiveBg = kapp->palette().active().base(); - c.primaryFg[0] = kapp->palette().active().text(); - c.primaryFg[1] = kapp->palette().active().text(); - c.nonPrintFg = kapp->palette().active().text(); - c.offsetFg = kapp->palette().active().text(); - c.secondaryFg = kapp->palette().active().text(); - c.leftSeparatorFg = kapp->palette().active().text(); - c.rightSeparatorFg = kapp->palette().active().text(); - c.cursorBg = kapp->palette().active().text(); - c.cursorFg = kapp->palette().active().base(); - c.gridFg = kapp->palette().active().text(); + c.textBg = kapp->tqpalette().active().base(); + c.secondTextBg = kapp->tqpalette().active().base(); + c.offsetBg = kapp->tqpalette().active().base(); + c.inactiveBg = kapp->tqpalette().active().base(); + c.primaryFg[0] = kapp->tqpalette().active().text(); + c.primaryFg[1] = kapp->tqpalette().active().text(); + c.nonPrintFg = kapp->tqpalette().active().text(); + c.offsetFg = kapp->tqpalette().active().text(); + c.secondaryFg = kapp->tqpalette().active().text(); + c.leftSeparatorFg = kapp->tqpalette().active().text(); + c.rightSeparatorFg = kapp->tqpalette().active().text(); + c.cursorBg = kapp->tqpalette().active().text(); + c.cursorFg = kapp->tqpalette().active().base(); + c.gridFg = kapp->tqpalette().active().text(); SDisplayColor defaultColor; c.bookmarkBg = defaultColor.bookmarkBg; c.bookmarkFg = defaultColor.bookmarkFg; @@ -513,46 +513,46 @@ void CHexEditorWidget::setMisc( const SDisplayMisc &misc ) void CHexEditorWidget::setHexadecimalMode( void ) { - layout().primaryMode = SDisplayLayout::hexadecimal; - layout().lineSize = line().lineSize[ SDisplayLine::hexadecimal ]; - layout().columnSize = line().columnSize[ SDisplayLine::hexadecimal ]; - mHexView->setLayout( layout() ); + tqlayout().primaryMode = SDisplayLayout::hexadecimal; + tqlayout().lineSize = line().lineSize[ SDisplayLine::hexadecimal ]; + tqlayout().columnSize = line().columnSize[ SDisplayLine::hexadecimal ]; + mHexView->setLayout( tqlayout() ); } void CHexEditorWidget::setDecimalMode( void ) { - layout().primaryMode = SDisplayLayout::decimal; - layout().lineSize = line().lineSize[ SDisplayLine::decimal ]; - layout().columnSize = line().columnSize[ SDisplayLine::decimal ]; - mHexView->setLayout( layout() ); + tqlayout().primaryMode = SDisplayLayout::decimal; + tqlayout().lineSize = line().lineSize[ SDisplayLine::decimal ]; + tqlayout().columnSize = line().columnSize[ SDisplayLine::decimal ]; + mHexView->setLayout( tqlayout() ); } void CHexEditorWidget::setOctalMode( void ) { - layout().primaryMode = SDisplayLayout::octal; - layout().lineSize = line().lineSize[ SDisplayLine::octal ]; - layout().columnSize = line().columnSize[ SDisplayLine::octal ]; - mHexView->setLayout( layout() ); + tqlayout().primaryMode = SDisplayLayout::octal; + tqlayout().lineSize = line().lineSize[ SDisplayLine::octal ]; + tqlayout().columnSize = line().columnSize[ SDisplayLine::octal ]; + mHexView->setLayout( tqlayout() ); } void CHexEditorWidget::setBinaryMode( void ) { - layout().primaryMode = SDisplayLayout::binary; - layout().lineSize = line().lineSize[ SDisplayLine::binary ]; - layout().columnSize = line().columnSize[ SDisplayLine::binary ]; - mHexView->setLayout( layout() ); + tqlayout().primaryMode = SDisplayLayout::binary; + tqlayout().lineSize = line().lineSize[ SDisplayLine::binary ]; + tqlayout().columnSize = line().columnSize[ SDisplayLine::binary ]; + mHexView->setLayout( tqlayout() ); } void CHexEditorWidget::setTextMode( void ) { - layout().primaryMode = SDisplayLayout::textOnly; - layout().lineSize = line().lineSize[ SDisplayLine::textOnly ]; - layout().columnSize = line().columnSize[ SDisplayLine::textOnly ]; - mHexView->setLayout( layout() ); + tqlayout().primaryMode = SDisplayLayout::textOnly; + tqlayout().lineSize = line().lineSize[ SDisplayLine::textOnly ]; + tqlayout().columnSize = line().columnSize[ SDisplayLine::textOnly ]; + mHexView->setLayout( tqlayout() ); } @@ -580,7 +580,7 @@ void CHexEditorWidget::newFile( void ) return; } - TQString url = i18n("Untitled %1").arg( mUntitledCount ); + TQString url = i18n("Untitled %1").tqarg( mUntitledCount ); // // If the url is already present in the document list (should not happen), @@ -605,7 +605,7 @@ void CHexEditorWidget::newFile( void ) if( errCode != Err_Success ) { TQString msg = i18n("Unable to create new document."); - KMessageBox::sorry( topLevelWidget(), msg, i18n("Operation Failed") ); + KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Operation Failed") ); return; } @@ -626,7 +626,7 @@ void CHexEditorWidget::newFile( const TQByteArray &data ) void CHexEditorWidget::open() { - KURL file = KFileDialog::getOpenURL( mWorkDir, "*" ,topLevelWidget() ); + KURL file = KFileDialog::getOpenURL( mWorkDir, "*" ,tqtopLevelWidget() ); if( file.isEmpty() ) return; @@ -764,7 +764,7 @@ bool CHexEditorWidget::selectDocument( const TQString &url, void CHexEditorWidget::insertFile( void ) { - KFileDialog fdlg(mWorkDir, TQString(), topLevelWidget(), 0, TRUE); + KFileDialog fdlg(mWorkDir, TQString(), tqtopLevelWidget(), 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( topLevelWidget(), msg, TQString(), KStdGuiItem::save(), KStdGuiItem::discard() ); + int reply = KMessageBox::warningYesNoCancel( tqtopLevelWidget(), 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( topLevelWidget(), msg, + int reply = KMessageBox::warningYesNoCancel( tqtopLevelWidget(), 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( topLevelWidget(), msg, + int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Reload") ); + KMessageBox::sorry( tqtopLevelWidget(), 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(topLevelWidget(),msg,i18n("Reload"), i18n("&Reload")); + int reply = KMessageBox::warningContinueCancel(tqtopLevelWidget(),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(topLevelWidget(), i18n("Print Hex-Document"))) + if (prt.setup(tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Print") ); + KMessageBox::sorry( tqtopLevelWidget(), 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( topLevelWidget(), msg, + int reply = KMessageBox::warningYesNo( tqtopLevelWidget(), 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( topLevelWidget(), 0, false ); + mExportDialog = new CExportDialog( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Export") ); + KMessageBox::sorry( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Export") ); + KMessageBox::sorry( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Export") ); + KMessageBox::sorry( tqtopLevelWidget(), 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( topLevelWidget(), msg, + int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Encode") ); + KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Encode") ); } } @@ -1306,34 +1306,34 @@ void CHexEditorWidget::enableInputLock( bool inputLock ) void CHexEditorWidget::toggleOffsetColumnVisibility( void ) { - layout().offsetVisible = layout().offsetVisible == true ? false : true; - mHexView->setLayout( layout() ); + tqlayout().offsetVisible = tqlayout().offsetVisible == true ? false : true; + mHexView->setLayout( tqlayout() ); } void CHexEditorWidget::toggleTextColumnVisibility( void ) { - layout().secondaryMode = layout().secondaryMode == SDisplayLayout::hide ? + tqlayout().secondaryMode = tqlayout().secondaryMode == SDisplayLayout::hide ? SDisplayLayout::textOnly : SDisplayLayout::hide; - mHexView->setLayout( layout() ); + mHexView->setLayout( tqlayout() ); } void CHexEditorWidget::toggleOffsetAsDecimal( void ) { - layout().offsetMode = layout().offsetMode == SDisplayLayout::hexadecimal ? + tqlayout().offsetMode = tqlayout().offsetMode == SDisplayLayout::hexadecimal ? SDisplayLayout::decimal : SDisplayLayout::hexadecimal; - mHexView->setLayout( layout() ); + mHexView->setLayout( tqlayout() ); } void CHexEditorWidget::toggleDataUppercase( void ) { - layout().primaryUpperCase = layout().primaryUpperCase == true ? false : true; - mHexView->setLayout( layout() ); + tqlayout().primaryUpperCase = tqlayout().primaryUpperCase == true ? false : true; + mHexView->setLayout( tqlayout() ); } void CHexEditorWidget::toggleOffsetUppercase( void ) { - layout().offsetUpperCase = layout().offsetUpperCase == true ? false : true; - mHexView->setLayout( layout() ); + tqlayout().offsetUpperCase = tqlayout().offsetUpperCase == true ? false : true; + mHexView->setLayout( tqlayout() ); } void CHexEditorWidget::toggleInsertMode( void ) @@ -1412,7 +1412,7 @@ void CHexEditorWidget::removeAllBookmark( void ) TQString msg = i18n("" "Deleted bookmarks can not be restored.\n" "Proceed?" ); - int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg ); + int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg ); if( reply != KMessageBox::Continue ) { return; @@ -1447,7 +1447,7 @@ void CHexEditorWidget::gotoOffset( void ) { if( mGotoDialog == 0 ) { - mGotoDialog = new CGotoDialog( topLevelWidget(), 0, false ); + mGotoDialog = new CGotoDialog( tqtopLevelWidget(), 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( topLevelWidget(), 0, false ); + mFindDialog = new CFindDialog( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Find") ); + KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Find") ); } } @@ -1580,7 +1580,7 @@ bool CHexEditorWidget::askWrap( bool fwd, const TQString &header ) "Continue from the end?" ); } - int reply = KMessageBox::questionYesNo( topLevelWidget(), msg, header, KStdGuiItem::cont(), KStdGuiItem::cancel() ); + int reply = KMessageBox::questionYesNo( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Find") ); + KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Find") ); } return( false ); } @@ -1613,7 +1613,7 @@ void CHexEditorWidget::findNavigator( SSearchControl &sc ) if( mFindNavigatorDialog == 0 ) { - mFindNavigatorDialog = new CFindNavigatorDialog(topLevelWidget(),0,false); + mFindNavigatorDialog = new CFindNavigatorDialog(tqtopLevelWidget(),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( topLevelWidget(), 0, false ); + mReplaceDialog = new CReplaceDialog( tqtopLevelWidget(), 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(topLevelWidget(), 0,false); + mReplacePromptDialog = new CReplacePromptDialog(tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Find & Replace")); + KMessageBox::information( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Find & Replace")); + KMessageBox::information( tqtopLevelWidget(), msg, i18n("Find & Replace")); } } @@ -1781,7 +1781,7 @@ void CHexEditorWidget::insertPattern( void ) { if( mInsertDialog == 0 ) { - mInsertDialog = new CInsertDialog( topLevelWidget(), 0, false ); + mInsertDialog = new CInsertDialog( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Encoding") ); + KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Encoding") ); } @@ -1803,7 +1803,7 @@ void CHexEditorWidget::strings( void ) { if( mStringDialog == 0 ) { - mStringDialog = new CStringDialog( topLevelWidget(), 0, false ); + mStringDialog = new CStringDialog( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Collect Strings") ); + KMessageBox::sorry( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Record Viewer") ); + KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Record Viewer") ); } void CHexEditorWidget::filter( void ) { if( mFilterDialog == 0 ) { - mFilterDialog = new CFilterDialog( topLevelWidget(), 0, false ); + mFilterDialog = new CFilterDialog( tqtopLevelWidget(), 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( topLevelWidget(), 0, false ); + mCharTableDialog = new CCharTableDialog( tqtopLevelWidget(), 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( topLevelWidget(), 0, false ); + mFileInfoDialog = new CFileInfoDialog( tqtopLevelWidget(), 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( topLevelWidget(), msg, + KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Collect Document Statistics") ); } @@ -1927,7 +1927,7 @@ void CHexEditorWidget::options( void ) { if( mOptionDialog == 0 ) { - mOptionDialog = new COptionDialog( topLevelWidget(), 0, false ); + mOptionDialog = new COptionDialog( tqtopLevelWidget(), 0, false ); if( mOptionDialog == 0 ) { return; } connect( mOptionDialog, TQT_SIGNAL(lineSizeChoice(const SDisplayLine &)), @@ -1958,8 +1958,8 @@ void CHexEditorWidget::favorites( void ) { TQString msg = i18n("" "Not available yet!\n" - "Save or retrive your favorite layout" ); - KMessageBox::sorry( topLevelWidget(), msg, i18n("Profiles") ); + "Save or retrive your favorite tqlayout" ); + KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Profiles") ); } @@ -1978,8 +1978,8 @@ int CHexEditorWidget::readURL( const KURL &url, bool insert ) // if( !url.isValid() ) { - TQString msg = i18n("Malformed URL\n%1").arg( url.url() ); - KMessageBox::sorry( topLevelWidget(), msg, i18n("Read URL") ); + TQString msg = i18n("Malformed URL\n%1").tqarg( url.url() ); + KMessageBox::sorry( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Write Failure") ); + KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") ); } } } @@ -2049,30 +2049,30 @@ bool CHexEditorWidget::readFile( const TQString &diskPath, const TQString &url, TQFileInfo info( diskPath ); if( info.exists() == false ) { - const TQString msg = i18n("The specified file does not exist.\n%1").arg( diskPath ); - KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") ); + const TQString msg = i18n("The specified file does not exist.\n%1").tqarg( diskPath ); + KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") ); return( false ); } if( info.isDir() == true ) { - const TQString msg = i18n("You have specified a folder.\n%1").arg( diskPath ); - KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") ); + const TQString msg = i18n("You have specified a folder.\n%1").tqarg( diskPath ); + KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") ); return( false ); } if( info.isReadable() == false ) { - const TQString msg = i18n("You do not have read permission to this file.\n%1").arg( diskPath ); - KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") ); + const TQString msg = i18n("You do not have read permission to this file.\n%1").tqarg( diskPath ); + KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") ); return( false ); } TQFile file( diskPath ); if( file.open( IO_ReadOnly | IO_Raw ) == false ) { - const TQString msg = i18n("An error occurred while trying to open the file.\n%1").arg( diskPath ); - KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") ); + const TQString msg = i18n("An error occurred while trying to open the file.\n%1").tqarg( diskPath ); + KMessageBox::sorry( tqtopLevelWidget(), 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( topLevelWidget(), msg, header ); + KMessageBox::sorry( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Write Failure") ); + KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") ); return( false ); } if( info.isWritable() == false ) { TQString msg = i18n("You do not have write permission."); - KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") ); + KMessageBox::sorry( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Write Failure") ); + KMessageBox::sorry( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Write Failure") ); + KMessageBox::sorry( tqtopLevelWidget(), 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( topLevelWidget(), msg, i18n("Loading Failed" ) ); + KMessageBox::error( tqtopLevelWidget(), msg, i18n("Loading Failed" ) ); return( false ); } @@ -2418,7 +2418,7 @@ int CHexEditorWidget::progressParse( const SProgressData &pd ) } - int reply = KMessageBox::warningYesNo( topLevelWidget(), msg, header, KStdGuiItem::cancel(), KStdGuiItem::cont() ); + int reply = KMessageBox::warningYesNo( tqtopLevelWidget(), 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( topLevelWidget(), msg ); + KMessageBox::sorry( tqtopLevelWidget(), msg ); } return( mProgressBusy ); diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h index 669d789..def98e0 100644 --- a/khexedit/hexeditorwidget.h +++ b/khexedit/hexeditorwidget.h @@ -83,7 +83,7 @@ class CHexEditorWidget : public TQWidget inline int defaultTextWidth( void ); inline CHexViewWidget *view( void ); - inline SDisplayLayout &layout( void ); + inline SDisplayLayout &tqlayout( void ); inline SDisplayLine &line( void ); inline SDisplayInputMode &inputMode( void ); inline SDisplayMisc::EOpenFile openFile( void ); @@ -170,10 +170,10 @@ class CHexEditorWidget : public TQWidget protected slots: void fontChanged( void ); void paletteChanged( void ); - void layoutChanged( const SDisplayLayout &layout ); + void layoutChanged( const SDisplayLayout &tqlayout ); void inputModeChanged( const SDisplayInputMode &input ); void setLineSize(const SDisplayLine &line ); - void setLayout( const SDisplayLayout &layout ); + void setLayout( const SDisplayLayout &tqlayout ); void setCursor( const SDisplayCursor &cursor ); void setColor( const SDisplayColor &color ); void setFont( const SDisplayFont &font ); @@ -259,9 +259,9 @@ inline CHexViewWidget *CHexEditorWidget::view( void ) return( mHexView ); } -inline SDisplayLayout &CHexEditorWidget::layout( void ) +inline SDisplayLayout &CHexEditorWidget::tqlayout( void ) { - return( mDisplayState.layout ); + return( mDisplayState.tqlayout ); } inline SDisplayLine &CHexEditorWidget::line( void ) diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h index f6b7d22..04f6425 100644 --- a/khexedit/hexeditstate.h +++ b/khexedit/hexeditstate.h @@ -23,7 +23,7 @@ #include <kapplication.h> #include <tqfont.h> -#include <palette.h> +#include <tqpalette.h> #include <kglobalsettings.h> @@ -382,8 +382,8 @@ class SDisplayColor textBg = TQt::white; secondTextBg = TQt::white; inactiveBg = TQt::gray; - selectBg = kapp->palette().active().highlight(); - selectFg = kapp->palette().active().highlightedText(); + selectBg = kapp->tqpalette().active().highlight(); + selectFg = kapp->tqpalette().active().highlightedText(); markBg = TQt::blue; markFg = TQt::white; primaryFg[0] = TQt::black; @@ -574,7 +574,7 @@ class SDisplayState { public: SDisplayLine line; - SDisplayLayout layout; + SDisplayLayout tqlayout; SDisplayCursor cursor; SDisplayColor color; SDisplayFont font; diff --git a/khexedit/hexmanagerwidget.cc b/khexedit/hexmanagerwidget.cc index 2d4fa31..0059c0a 100644 --- a/khexedit/hexmanagerwidget.cc +++ b/khexedit/hexmanagerwidget.cc @@ -19,7 +19,7 @@ */ #include <klocale.h> -#include <layout.h> +#include <tqlayout.h> #include "hexmanagerwidget.h" #include "searchbar.h" @@ -70,7 +70,7 @@ void CHexManagerWidget::updateLayout( void ) { if( mValid == false ) { return; } - delete layout(); + delete tqlayout(); TQVBoxLayout *vlay = new TQVBoxLayout( this, 0, 0 ); if( mSearchBar && mSearchBarPosition == AboveEditor ) @@ -126,19 +126,19 @@ void CHexManagerWidget::setConversionVisibility( EConversionPosition position ) else if( mConversionPosition == Float ) { TQPoint point = mapToGlobal( TQPoint(0,0) ); - TQRect rect = geometry(); + TQRect rect = tqgeometry(); TQPoint p; - 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() ); + 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() ); mConverter->reparent( 0, WStyle_Customize | WStyle_DialogBorder, p, true ); mConverter->setCaption(kapp->makeStdCaption(i18n("Conversion"))); } else { mConversionPosition = Embed; - uint utilHeight = mConverter->minimumSize().height(); + uint utilHeight = mConverter->tqminimumSize().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->sizeHint().width(); + int converterWidth = mConverter->tqsizeHint().width(); w = TQMAX( w, converterWidth ); } return( w ); diff --git a/khexedit/hextoolwidget.cc b/khexedit/hextoolwidget.cc index 484f8a1..48a6a08 100644 --- a/khexedit/hextoolwidget.cc +++ b/khexedit/hextoolwidget.cc @@ -23,7 +23,7 @@ #include "hextoolwidget.h" #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <tqcheckbox.h> #include <tqcombobox.h> @@ -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->setAlignment( AlignRight|AlignVCenter ); + Label->tqsetAlignment( AlignRight|AlignVCenter ); ValuesBox->addWidget( Label, i, 0 ); mText1[i] = new TQLineEdit( this ); mText1[i]->setReadOnly( true ); - mText1[i]->setAlignment( AlignRight ); + mText1[i]->tqsetAlignment( AlignRight ); ValuesBox->addWidget( mText1[i], i, 1 ); Label = new TQLabel( msg2[i], this ); - Label->setAlignment( AlignRight|AlignVCenter ); + Label->tqsetAlignment( AlignRight|AlignVCenter ); ValuesBox->addWidget( Label, i, 3 ); mText2[i] = new TQLineEdit( this ); mText2[i]->setReadOnly( true ); - mText2[i]->setAlignment( AlignRight ); + mText2[i]->tqsetAlignment( AlignRight ); ValuesBox->addWidget( mText2[i], i, 4 ); Label = new TQLabel( msg3[i], this ); - Label->setAlignment( AlignRight|AlignVCenter ); + Label->tqsetAlignment( AlignRight|AlignVCenter ); mUtilBox->addWidget( Label, i, 1 ); mText3[i] = new TQLineEdit( this ); mText3[i]->setReadOnly( true ); - mText3[i]->setAlignment( AlignRight ); + mText3[i]->tqsetAlignment( 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->sizeHint() ); + mCheckIntelFormat->setMinimumSize( mCheckIntelFormat->tqsizeHint() ); 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->sizeHint() ); + mCheckHexadecimal->setMinimumSize( mCheckHexadecimal->tqsizeHint() ); 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->setAlignment( AlignRight|AlignVCenter ); + bitLabel->tqsetAlignment( 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->sizeHint() ); + mBitCombo->setMinimumSize( mBitCombo->tqsizeHint() ); 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( sizeHint() ); + setMinimumSize( tqsizeHint() ); show(); } @@ -258,7 +258,7 @@ void CHexToolWidget::cursorChanged( SCursorState &state ) // checking for system endianess, using the compiler for the byte interpretation and cutting bloaded code // TODO: add PDP endianess void *P8Bit, *P16Bit, *P32Bit, *P64Bit; - // ensure strict alignment for double as needed on some architectures (e.g. PA-RISC) + // ensure strict tqalignment for double as needed on some architectures (e.g. PA-RISC) typedef union { unsigned char b[8]; double d; } aligned_t; aligned_t Data; if( diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc index db9274a..555e0cc 100644 --- a/khexedit/hexviewwidget.cc +++ b/khexedit/hexviewwidget.cc @@ -20,7 +20,7 @@ #include <iostream> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqdrawutil.h> @@ -233,7 +233,7 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name, setStartY(0); setAcceptDrops(true); - setDropHighlight(false); // Init state + frame shape + setDropHighlight(false); // Init state + frame tqshape setBackgroundColor( mHexBuffer->backgroundColor() ); } @@ -438,7 +438,7 @@ void CHexViewWidget::changeYPos( int p ) void CHexViewWidget::clipboardChanged( void ) { - disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), + disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); unselect(); } @@ -459,7 +459,7 @@ void CHexViewWidget::filter( SFilterControl &fc ) int errCode = mHexBuffer->filter( fc ); if( errCode == Err_Success ) { - repaint(); + tqrepaint(); emit dataChanged(); emit cursorChanged( mHexBuffer->cursorState() ); } @@ -716,9 +716,9 @@ void CHexViewWidget::setPalette( const TQPalette &p ) } -void CHexViewWidget::setLayout( SDisplayLayout &layout ) +void CHexViewWidget::setLayout( SDisplayLayout &tqlayout ) { - mLayout = layout; + mLayout = tqlayout; mHexBuffer->setLayout( mLayout ); updateWindow(); @@ -739,7 +739,7 @@ void CHexViewWidget::setCursor( const SDisplayCursor &cursor, bool /*updateDisplay*/ ) { mCursor = cursor; - mHexBuffer->setCursorShapeModifier( cursor.alwaysBlockShape, + mHexBuffer->settqCursorShapeModifier( cursor.alwaysBlockShape, cursor.thickInsertShape ); setupCursorTimer(); redrawFromOffset( mHexBuffer->cursorOffset(), false ); @@ -752,7 +752,7 @@ void CHexViewWidget::setColor( const SDisplayColor &color, mHexBuffer->setColor( mColor ); if( updateDisplay == true ) { - repaint(); + tqrepaint(); } } @@ -796,7 +796,7 @@ int CHexViewWidget::setEncoding( CConversion::EMode mode, CProgress &p ) int errCode = mHexBuffer->setEncoding( mode, p ); if( errCode == Err_Success ) { - repaint(); + tqrepaint(); emit cursorChanged( mHexBuffer->cursorState() ); emit encodingChanged( mHexBuffer->encoding() ); } @@ -964,7 +964,7 @@ void CHexViewWidget::copy( void ) { return; } - disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), + disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); // // Note: Do no give the CHexDrag a parent != 0. The clipboard @@ -974,8 +974,8 @@ void CHexViewWidget::copy( void ) // is destroyed. We will then have a double destroy situation // when the app. is closed (=> segfault). // - TQApplication::clipboard()->setData(new CHexDrag( buf )); - connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), + TQApplication::tqclipboard()->setData(new CHexDrag( buf )); + connect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); } @@ -988,10 +988,10 @@ void CHexViewWidget::copyText( int columnSegment ) return; } - disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), + disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); - TQApplication::clipboard()->setText( buf.data() ); - connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), + TQApplication::tqclipboard()->setText( buf.data() ); + connect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); } @@ -999,7 +999,7 @@ void CHexViewWidget::copyText( int columnSegment ) void CHexViewWidget::paste( void ) { - TQMimeSource *data = TQApplication::clipboard()->data(); + TQMimeSource *data = TQApplication::tqclipboard()->data(); if( data != 0 ) { TQByteArray buf; @@ -1099,11 +1099,11 @@ int CHexViewWidget::bookmarkMenu( const TQString &title ) if( p == 0 ) { continue; } text.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF ); - text.prepend( TQString("[%1] %2: ").arg(i+1).arg(i18n("Offset")) ); + text.prepend( TQString("[%1] %2: ").tqarg(i+1).tqarg(i18n("Offset")) ); popup->insertItem( text, i ); } - TQSize s(popup->sizeHint()); + TQSize s(popup->tqsizeHint()); TQPoint center( (width()-s.width())/2, (height()-s.height())/2 ); int position = popup->exec( mapToGlobal(center) ); delete popup; @@ -1379,7 +1379,7 @@ void CHexViewWidget::drawFrame( TQPainter *p ) // accepts a drop. The setPalette() function causes quite a bit of flicker // in the scrollbars (even when PropagationMode is NoChildren), so I // draw the frame manually when it can accept a drop. Note that the - // code below is for the frame shape "TQFrame::WinPanel|TQFrame::Plain" + // code below is for the frame tqshape "TQFrame::WinPanel|TQFrame::Plain" // if( mDropHighlight == true ) { @@ -1860,7 +1860,7 @@ void CHexViewWidget::setCursorPosition(int x, int y, bool init, bool cellLevel) void CHexViewWidget::redrawInterval( uint startOffset, uint stopOffset ) { // - // Can be improved, I repaint the entire line even if the offsets + // Can be improved, I tqrepaint the entire line even if the offsets // only specify one byte. // uint lineStart = mHexBuffer->calculateLine( startOffset ); @@ -2270,7 +2270,7 @@ void CHexViewWidget::setDropHighlight( bool dropHighlight ) // // 2000-01-10 Espen Sand // Highlight. I have reimplemented TQFrame::drawFrame(TQPainter *) - // to support a custom frame color. I assume the frame shape is + // to support a custom frame color. I assume the frame tqshape is // "TQFrame::WinPanel|TQFrame::Plain" in that function. // setFrameStyle( TQFrame::WinPanel|TQFrame::Plain ); diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h index a958309..1e3f02c 100644 --- a/khexedit/hexviewwidget.h +++ b/khexedit/hexviewwidget.h @@ -140,7 +140,7 @@ class CHexViewWidget : public TQFrame virtual void setPalette( const TQPalette & ); void setInputMode( SDisplayInputMode &mode ); - void setLayout( SDisplayLayout &layout ); + void setLayout( SDisplayLayout &tqlayout ); void setCursor( const SDisplayCursor &cursor, bool updateDisplay ); void setColor( const SDisplayColor &color, bool updateDisplay ); void setFont( const SDisplayFontInfo &fontInfo, bool updateDisplay ); @@ -218,7 +218,7 @@ class CHexViewWidget : public TQFrame void cursorChanged( SCursorState &state ); void fileState( SFileState &state ); void dataChanged( void ); - void layoutChanged( const SDisplayLayout &layout ); + void layoutChanged( const SDisplayLayout &tqlayout ); void inputModeChanged( const SDisplayInputMode &mode ); void bookmarkChanged( TQPtrList<SCursorOffset> &list ); void editMode( CHexBuffer::EEditMode editMode ); diff --git a/khexedit/lib/codecs/kbinarybytecodec.cpp b/khexedit/lib/codecs/kbinarybytecodec.cpp index a49a460..fc9fe8d 100644 --- a/khexedit/lib/codecs/kbinarybytecodec.cpp +++ b/khexedit/lib/codecs/kbinarybytecodec.cpp @@ -24,7 +24,7 @@ using namespace KHE; void KBinaryByteCodec::encode( TQString &Digits, unsigned int Pos, const unsigned char Char ) const { for( unsigned char M=1<<7; M>0; M>>=1 ) - Digits.at(Pos++) = (Char & M) ? '1' : '0'; + Digits.tqat(Pos++) = (Char & M) ? '1' : '0'; } void KBinaryByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned char Char ) const @@ -36,7 +36,7 @@ void KBinaryByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned break; // now set the for( ; M>0; M>>=1 ) - Digits.at(Pos++) = (Char & M) ? '1' : '0'; + Digits.tqat(Pos++) = (Char & M) ? '1' : '0'; } diff --git a/khexedit/lib/codecs/kbytecodec.cpp b/khexedit/lib/codecs/kbytecodec.cpp index f4847ba..900055e 100644 --- a/khexedit/lib/codecs/kbytecodec.cpp +++ b/khexedit/lib/codecs/kbytecodec.cpp @@ -40,7 +40,7 @@ KByteCodec *KByteCodec::createCodec( KCoding C ) unsigned int KByteCodec::decode( unsigned char *Char, const TQString &Digits, uint Pos ) const { - //kdDebug() << TQString("KByteCodec::decode(%1,%2)").arg(Digits).arg(Pos) << endl; + //kdDebug() << TQString("KByteCodec::decode(%1,%2)").tqarg(Digits).tqarg(Pos) << endl; const uint P = Pos; // remove leading 0s @@ -50,7 +50,7 @@ unsigned int KByteCodec::decode( unsigned char *Char, const TQString &Digits, ui unsigned int d = encodingWidth(); do { - if( !appendDigit(&C,Digits.at(Pos)) ) + if( !appendDigit(&C,Digits.tqat(Pos)) ) break; ++Pos; diff --git a/khexedit/lib/codecs/kdecimalbytecodec.cpp b/khexedit/lib/codecs/kdecimalbytecodec.cpp index c556875..065eb81 100644 --- a/khexedit/lib/codecs/kdecimalbytecodec.cpp +++ b/khexedit/lib/codecs/kdecimalbytecodec.cpp @@ -24,12 +24,12 @@ using namespace KHE; void KDecimalByteCodec::encode( TQString &Digits, unsigned int Pos, unsigned char Char ) const { unsigned char C = Char / 100; - Digits.at(Pos++) = '0'+C; + Digits.tqat(Pos++) = '0'+C; Char -= C * 100; C = Char / 10; - Digits.at(Pos++) = '0'+C; + Digits.tqat(Pos++) = '0'+C; Char -= C * 10; - Digits.at(Pos) = '0'+Char; + Digits.tqat(Pos) = '0'+Char; } @@ -38,15 +38,15 @@ void KDecimalByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigne unsigned char C; if( (C = Char / 100) ) { - Digits.at(Pos++) = '0'+C; + Digits.tqat(Pos++) = '0'+C; Char -= C * 100; } if( (C = Char / 10) ) { - Digits.at(Pos++) = '0'+C; + Digits.tqat(Pos++) = '0'+C; Char -= C * 10; } - Digits.at(Pos) = '0'+Char; + Digits.tqat(Pos) = '0'+Char; } diff --git a/khexedit/lib/codecs/kebcdic1047charcodec.cpp b/khexedit/lib/codecs/kebcdic1047charcodec.cpp index e787715..2e91035 100644 --- a/khexedit/lib/codecs/kebcdic1047charcodec.cpp +++ b/khexedit/lib/codecs/kebcdic1047charcodec.cpp @@ -98,7 +98,7 @@ static const char KEBCDIC1047CharCodecName[] = "EBCDIC 1047"; bool KEBCDIC1047CharCodec::encode( char *D, const TQChar &C ) const { - int I = C.unicode(); + int I = C.tqunicode(); // not in range? if( 0x00FF < I ) return false; @@ -119,6 +119,6 @@ const TQString& KEBCDIC1047CharCodec::name() const const TQString& KEBCDIC1047CharCodec::codecName() { - static const TQString Name( TQString::fromLatin1(KEBCDIC1047CharCodecName) ); + static const TQString Name( TQString::tqfromLatin1(KEBCDIC1047CharCodecName) ); return Name; } diff --git a/khexedit/lib/codecs/khexadecimalbytecodec.cpp b/khexedit/lib/codecs/khexadecimalbytecodec.cpp index 596fd24..46abdad 100644 --- a/khexedit/lib/codecs/khexadecimalbytecodec.cpp +++ b/khexedit/lib/codecs/khexadecimalbytecodec.cpp @@ -41,16 +41,16 @@ bool KHexadecimalByteCodec::smallDigits() const { return Digit != BigDigit; } void KHexadecimalByteCodec::encode( TQString &Digits, unsigned int Pos, unsigned char Char ) const { - Digits.at(Pos++) = Digit[Char>>4]; - Digits.at(Pos) = Digit[Char&0x0F]; + Digits.tqat(Pos++) = Digit[Char>>4]; + Digits.tqat(Pos) = Digit[Char&0x0F]; } void KHexadecimalByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned char Char ) const { unsigned char C; if( (C = (Char>>4)) ) - Digits.at(Pos++) = Digit[C]; - Digits.at(Pos) = Digit[Char&0x0F]; + Digits.tqat(Pos++) = Digit[C]; + Digits.tqat(Pos) = Digit[Char&0x0F]; } diff --git a/khexedit/lib/codecs/koctalbytecodec.cpp b/khexedit/lib/codecs/koctalbytecodec.cpp index 44c7952..7aa156d 100644 --- a/khexedit/lib/codecs/koctalbytecodec.cpp +++ b/khexedit/lib/codecs/koctalbytecodec.cpp @@ -23,9 +23,9 @@ using namespace KHE; void KOctalByteCodec::encode( TQString &Digits, unsigned int Pos, unsigned char Char ) const { - Digits.at(Pos++) = '0'+(Char>>6); - Digits.at(Pos++) = '0'+((Char>>3)&0x07); - Digits.at(Pos) = '0'+((Char) &0x07); + Digits.tqat(Pos++) = '0'+(Char>>6); + Digits.tqat(Pos++) = '0'+((Char>>3)&0x07); + Digits.tqat(Pos) = '0'+((Char) &0x07); } @@ -33,10 +33,10 @@ void KOctalByteCodec::encodeShort( TQString &Digits, unsigned int Pos, unsigned { unsigned char C; if( (C = (Char>>6)&0x07) ) - Digits.at(Pos++) = '0'+C; + Digits.tqat(Pos++) = '0'+C; if( (C = (Char>>3)&0x07) ) - Digits.at(Pos++) = '0'+C; - Digits.at(Pos) = '0'+((Char)&0x07); + Digits.tqat(Pos++) = '0'+C; + Digits.tqat(Pos) = '0'+((Char)&0x07); } diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp index 137c920..f5bcc65 100644 --- a/khexedit/lib/codecs/ktextcharcodec.cpp +++ b/khexedit/lib/codecs/ktextcharcodec.cpp @@ -16,7 +16,7 @@ // qt specific -#include "textcodec.h" +#include "tqtextcodec.h" // kde specific #include <kglobal.h> #include <klocale.h> @@ -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::fromLatin1(Codec->name()) ); + CodecNames.append( TQString::tqfromLatin1(Codec->name()) ); } } @@ -150,7 +150,7 @@ TQString KTextCharCodec::nameOfEncoding( KEncoding C ) if( N != 0 ) { - TQString CodeName = TQString::fromLatin1( N ); + TQString CodeName = TQString::tqfromLatin1( 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::fromLatin1( EncodingNames[i].Name ); + TQString Name = TQString::tqfromLatin1( EncodingNames[i].Name ); TQTextCodec* Codec = KGlobal::charsets()->codecForName( Name, Found ); if( Found ) - CodecNames.append( TQString::fromLatin1(Codec->name()) ); + CodecNames.append( TQString::tqfromLatin1(Codec->name()) ); } } @@ -231,6 +231,6 @@ KHEChar KTextCharCodec::decode( char Byte ) const const TQString& KTextCharCodec::name() const { if( Name.isNull() ) - Name = TQString::fromLatin1( Codec->name() ); + Name = TQString::tqfromLatin1( Codec->name() ); return Name; } diff --git a/khexedit/lib/codecs/ktextcharcodec.h b/khexedit/lib/codecs/ktextcharcodec.h index 8d834ea..05a40ab 100644 --- a/khexedit/lib/codecs/ktextcharcodec.h +++ b/khexedit/lib/codecs/ktextcharcodec.h @@ -51,9 +51,9 @@ class KTextCharCodec : public KCharCodec protected: TQTextCodec *Codec; - /** decodes the chars to unicode */ + /** decodes the chars to tqunicode */ TQTextDecoder *Decoder; - /** encodes the chars from unicode */ + /** encodes the chars from tqunicode */ TQTextEncoder *Encoder; /** */ mutable TQString Name; diff --git a/khexedit/lib/kbordercolumn.cpp b/khexedit/lib/kbordercolumn.cpp index 4a22919..170f972 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().styleHint( TQStyle::SH_Table_GridLineColor, View ); - P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() ); + int GridColor = View->tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, View ); + P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->tqcolorGroup().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().styleHint( TQStyle::SH_Table_GridLineColor, View ); - P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() ); + int GridColor = View->tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, View ); + P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->tqcolorGroup().mid() ); P->drawLine( LX, Ys.start(), LX, Ys.end() ) ; } } diff --git a/khexedit/lib/kbuffercoltextexport.cpp b/khexedit/lib/kbuffercoltextexport.cpp index 142504c..9ee6f77 100644 --- a/khexedit/lib/kbuffercoltextexport.cpp +++ b/khexedit/lib/kbuffercoltextexport.cpp @@ -38,7 +38,7 @@ KBufferColTextExport::KBufferColTextExport( const KBufferColumn* BufferColumn, c : Data( D ), CoordRange( CR ) { - NoOfBytesPerLine = BufferColumn->layout()->noOfBytesPerLine(); + NoOfBytesPerLine = BufferColumn->tqlayout()->noOfBytesPerLine(); Pos = new int[NoOfBytesPerLine]; // TODO: remove this hack and make it more general diff --git a/khexedit/lib/kbuffercolumn.cpp b/khexedit/lib/kbuffercolumn.cpp index fb2cfb9..1d26bf0 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->colorGroup(); + const TQColorGroup &CG = View->tqcolorGroup(); // 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->colorGroup(); + const TQColorGroup &CG = View->tqcolorGroup(); 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->colorGroup(); + const TQColorGroup &CG = View->tqcolorGroup(); 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->colorGroup(); + const TQColorGroup &CG = View->tqcolorGroup(); TQColor Color = CG.text(); TQBrush Brush( CG.base(), TQt::SolidPattern ); diff --git a/khexedit/lib/kbuffercolumn.h b/khexedit/lib/kbuffercolumn.h index 10e930d..47f21d1 100644 --- a/khexedit/lib/kbuffercolumn.h +++ b/khexedit/lib/kbuffercolumn.h @@ -39,7 +39,7 @@ class KCharCodec; const int NoByteFound = -1; /** base class of all buffer column displayers - * holds all information about the vertical layout of a buffer column + * holds all information about the vertical tqlayout of a buffer column * knows how to paint the data and the editing things (focus, cursor, selection) * but does not offer * @@ -154,7 +154,7 @@ class KBufferColumn : public KColumn int firstPos() const; int lastPos() const; KSection visiblePositions() const; - const KBufferLayout *layout() const; + const KBufferLayout *tqlayout() const; KCharCodec* codec() const; protected: @@ -184,7 +184,7 @@ class KBufferColumn : public KColumn protected: /** pointer to the buffer */ KDataBuffer *Buffer; - /** pointer to the layout */ + /** pointer to the tqlayout */ const KBufferLayout *Layout; /** pointer to the ranges */ KBufferRanges *Ranges; @@ -242,7 +242,7 @@ inline int KBufferColumn::firstPos() const { return PaintPositions.start(); } inline int KBufferColumn::lastPos() const { return PaintPositions.end(); } inline KSection KBufferColumn::visiblePositions() const { return PaintPositions; } -inline const KBufferLayout *KBufferColumn::layout() const { return Layout; } +inline const KBufferLayout *KBufferColumn::tqlayout() const { return Layout; } inline void KBufferColumn::setCodec( KCharCodec *C ) { Codec = C; } diff --git a/khexedit/lib/kbuffercursor.h b/khexedit/lib/kbuffercursor.h index 855b3e8..93205cc 100644 --- a/khexedit/lib/kbuffercursor.h +++ b/khexedit/lib/kbuffercursor.h @@ -27,10 +27,10 @@ namespace KHE class KBufferLayout; -/**@short navigates through the buffer in an abstract way, based on the layout +/**@short navigates through the buffer in an abstract way, based on the tqlayout * * The cursor is allowed to access every coord that has content as - * described in the layout. It holds the coord of the actual position + * described in the tqlayout. It holds the coord of the actual position * and the according index in the data array. * * To enable the cursor to be placed behind the last position in a line @@ -138,7 +138,7 @@ class KBufferCursor void stepToEnd(); private: - /** layout, tells how the column is organized */ + /** tqlayout, tells how the column is organized */ const KBufferLayout *Layout; /** Position in buffer */ @@ -151,7 +151,7 @@ class KBufferCursor */ bool Behind : 1; - /** tells whether there could be a position behind the end of the layout */ + /** tells whether there could be a position behind the end of the tqlayout */ bool AppendPosEnabled : 1; }; diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp index 80b1d1c..c9cc54a 100644 --- a/khexedit/lib/kbufferdrag.cpp +++ b/khexedit/lib/kbufferdrag.cpp @@ -17,7 +17,7 @@ // qt specific #include <tqcstring.h> -#include <textcodec.h> +#include <tqtextcodec.h> // kde specific #include <kglobal.h> #include <klocale.h> @@ -135,7 +135,7 @@ const char *KBufferDrag::format( int i ) const } -TQByteArray KBufferDrag::encodedData( const char *Format ) const +TQByteArray KBufferDrag::tqencodedData( const char *Format ) const { if( Format != 0 ) { @@ -166,7 +166,7 @@ TQByteArray KBufferDrag::encodedData( const char *Format ) const { KHEChar B = CharCodec->decode( Data[i] ); - Text.at(i) = B.isUndefined() ? KHEChar(UndefinedChar) : + Text.tqat(i) = B.isUndefined() ? KHEChar(UndefinedChar) : (!B.isPrint() && B != Tab && B != Return ) ? KHEChar(SubstituteChar) : B; } // clean up @@ -224,12 +224,12 @@ bool KBufferDrag::canDecode( const TQMimeSource* Source ) bool KBufferDrag::decode( const TQMimeSource* Source, TQByteArray &Dest ) { -// Dest = Source->encodedData( MediaString ); +// Dest = Source->tqencodedData( MediaString ); // return Dest.size() != 0; bool CanDecode = Source->provides( OctetStream ); if( CanDecode ) - Dest = Source->encodedData( OctetStream ); + Dest = Source->tqencodedData( OctetStream ); return CanDecode; } diff --git a/khexedit/lib/kbufferdrag.h b/khexedit/lib/kbufferdrag.h index 3af0ebd..effd9a2 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 encodedData( const char* ) const; + virtual TQByteArray tqencodedData( const char* ) const; public: virtual void setData( const TQByteArray &); diff --git a/khexedit/lib/kbufferlayout.h b/khexedit/lib/kbufferlayout.h index c243225..bd92005 100644 --- a/khexedit/lib/kbufferlayout.h +++ b/khexedit/lib/kbufferlayout.h @@ -24,7 +24,7 @@ namespace KHE { -/**@short the logical layout of a plain buffer view +/**@short the logical tqlayout of a plain buffer view * * Given the values for * * length of the buffer, @@ -38,7 +38,7 @@ namespace KHE { * * final position in this line, and * * the total number of lines (is final line +1 or 0) * - * This layout sees the buffer as a continous stream of byte, + * This tqlayout sees the buffer as a continous stream of byte, * thus uses each line after the start from the begin to the end. * * If the buffer is empty the end coord will be set one pos left to the start coord @@ -75,7 +75,7 @@ class KBufferLayout /** returns the coord of the end */ KBufferCoord final() const; - /** tells how much lines this layout needs (incl. blank leading lines due to StartOffset) */ + /** tells how much lines this tqlayout needs (incl. blank leading lines due to StartOffset) */ int noOfLines() const; diff --git a/khexedit/lib/kbufferranges.h b/khexedit/lib/kbufferranges.h index ed2cbce..6b293b2 100644 --- a/khexedit/lib/kbufferranges.h +++ b/khexedit/lib/kbufferranges.h @@ -28,7 +28,7 @@ namespace KHE { /** a class to control all the ranges like marking and selections - * holds also all modified ranges and merges them so a repaint can take its info from here + * holds also all modified ranges and merges them so a tqrepaint can take its info from here * * @author Friedrich W. H. Kossebau */ diff --git a/khexedit/lib/kbytesedit.h b/khexedit/lib/kbytesedit.h index eedf025..915276b 100644 --- a/khexedit/lib/kbytesedit.h +++ b/khexedit/lib/kbytesedit.h @@ -39,7 +39,7 @@ class KBytesEditPrivate; * possible changes are told to the widget by repaintRange * b) changing data ranges -> data pointer and length might change * changes told by - * * resetData( char *, int size, bool repaint ); + * * resetData( char *, int size, bool tqrepaint ); * * * 2. used as editor * a) static data ranges @@ -137,7 +137,7 @@ class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit */ void setKeepsMemory( bool KM = true ); - /** repaint the indizes from i1 to i2 */ + /** tqrepaint the indizes from i1 to i2 */ void repaintRange( int i1, int i2 ); protected: diff --git a/khexedit/lib/kcolumnsview.cpp b/khexedit/lib/kcolumnsview.cpp index 4bb939a..2b0b157 100644 --- a/khexedit/lib/kcolumnsview.cpp +++ b/khexedit/lib/kcolumnsview.cpp @@ -167,7 +167,7 @@ void KColumnsView::drawContents( TQPainter *P, int cx, int cy, int cw, int ch ) if( AffectedLines.isValid() ) { TQPainter Paint; - Paint.begin( const_cast<TQPixmap*>(&LineBuffer), this ); + Paint.tqbegin( const_cast<TQPixmap*>(&LineBuffer), this ); // starting painting with the first line KColumn *C = RedrawColumns.first(); @@ -198,7 +198,7 @@ void KColumnsView::drawContents( TQPainter *P, int cx, int cy, int cw, int ch ) break; // to avoid flickers we first paint to the linebuffer - Paint.begin( TQT_TQPAINTDEVICE(&LineBuffer), this ); + Paint.tqbegin( TQT_TQPAINTDEVICE(&LineBuffer), this ); KColumn *C = RedrawColumns.first(); Paint.translate( C->x(), 0 ); diff --git a/khexedit/lib/kcursor.h b/khexedit/lib/kcursor.h index 17b4371..bb66003 100644 --- a/khexedit/lib/kcursor.h +++ b/khexedit/lib/kcursor.h @@ -38,7 +38,7 @@ class KCursor public: /** sets size of the full cursor */ void setSize( KPixelX Width, KPixelY Height ); - /** sets the shape of the cursor to be drawn */ + /** sets the tqshape of the cursor to be drawn */ void setShape( KPixelX X, KPixelX W ); public: // access diff --git a/khexedit/lib/kfixedsizebuffer.cpp b/khexedit/lib/kfixedsizebuffer.cpp index 784858c..83fd134 100644 --- a/khexedit/lib/kfixedsizebuffer.cpp +++ b/khexedit/lib/kfixedsizebuffer.cpp @@ -214,7 +214,7 @@ int KFixedSizeBuffer::fill( const char FChar, int FillLength, unsigned int Pos ) int KFixedSizeBuffer::compare( const KDataBuffer &Other, KSection OtherRange, unsigned int Pos ) { - //kdDebug() << TQString("Pos: %1, OtherRange: (%3/%4)" ).arg(Pos).arg(OtherRange.start()).arg(OtherRange.end()) + //kdDebug() << TQString("Pos: %1, OtherRange: (%3/%4)" ).tqarg(Pos).tqarg(OtherRange.start()).tqarg(OtherRange.end()) // << endl; // test other values if( OtherRange.startsBehind(Other.size()-1) ) @@ -245,14 +245,14 @@ int KFixedSizeBuffer::compare( const KDataBuffer &Other, KSection OtherRange, un ValueByLength = -1; } //kdDebug() - // << TQString( "Range: (%1/%2), OtherRange: (%3/%4)" ).arg(Range.start()).arg(Range.end()).arg(OtherRange.start()).arg(OtherRange.end()) + // << TQString( "Range: (%1/%2), OtherRange: (%3/%4)" ).tqarg(Range.start()).tqarg(Range.end()).tqarg(OtherRange.start()).tqarg(OtherRange.end()) // << endl; int oi = OtherRange.start(); for( int i=Range.start(); i<=Range.end(); ++i,++oi ) { char OD = Other.datum(oi); char D = Data[i]; - //kdDebug() << TQString("%1==%2").arg((int)D).arg((int)OD) << endl; + //kdDebug() << TQString("%1==%2").tqarg((int)D).tqarg((int)OD) << endl; if( OD == D ) continue; return OD < D ? 1 : -1; diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp index 54726fa..01d7602 100644 --- a/khexedit/lib/khexedit.cpp +++ b/khexedit/lib/khexedit.cpp @@ -94,7 +94,7 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl InZooming( false ), d( 0 ) { - // initalize layout + // initalize tqlayout if( DataBuffer ) BufferLayout->setLength( DataBuffer->size() ); BufferLayout->setNoOfLinesPerPage( noOfLinesPerPage() ); @@ -199,7 +199,7 @@ void KHexEdit::setOverwriteMode( bool OM ) OverWrite = OM; // affected: - // cursor shape + // cursor tqshape bool ChangeCursor = !( CursorPaused || ValueEditor->isInEditMode() ); if( ChangeCursor ) pauseCursor(); @@ -548,17 +548,17 @@ void KHexEdit::toggleOffsetColumn( bool Visible ) } -TQSize KHexEdit::sizeHint() const +TQSize KHexEdit::tqsizeHint() const { return TQSize( totalWidth(), totalHeight() ); } -TQSize KHexEdit::minimumSizeHint() const +TQSize KHexEdit::tqminimumSizeHint() const { // TODO: better minimal width (visibility!) return TQSize( OffsetColumn->visibleWidth()+FirstBorderColumn->visibleWidth()+SecondBorderColumn->visibleWidth()+valueColumn().byteWidth()+charColumn().byteWidth(), - lineHeight() + noOfLines()>1? tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent):0 ); + lineHeight() + noOfLines()>1? tqstyle().tqpixelMetric(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().pixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width(); + KPixelX ScrollbarExtent = tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width(); KPixelX AvailableWidth = FullWidth; if( VerticalScrollbarIsVisible ) @@ -850,7 +850,7 @@ void KHexEdit::cut() if( !Drag ) return; - TQApplication::clipboard()->setData( Drag, ClipboardMode ); + TQApplication::tqclipboard()->setData( Drag, ClipboardMode ); removeSelectedData(); } @@ -862,7 +862,7 @@ void KHexEdit::copy() if( !Drag ) return; - TQApplication::clipboard()->setData( Drag, ClipboardMode ); + TQApplication::tqclipboard()->setData( Drag, ClipboardMode ); } @@ -871,7 +871,7 @@ void KHexEdit::paste() if( isReadOnly() ) return; - TQMimeSource *Source = TQApplication::clipboard()->data( ClipboardMode ); + TQMimeSource *Source = TQApplication::tqclipboard()->data( ClipboardMode ); pasteFromSource( Source ); } @@ -1042,7 +1042,7 @@ void KHexEdit::updateLength() void KHexEdit::clipboardChanged() { // don't listen to selection changes - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0 ); + disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, 0 ); selectAll( false ); } @@ -1192,11 +1192,11 @@ bool KHexEdit::eventFilter( TQObject *O, TQEvent *E ) // if( O == this && E->type() == TQEvent::PaletteChange ) // { -// TQColor old( viewport()->colorGroup().color(TQColorGroup::Text) ); +// TQColor old( viewport()->tqcolorGroup().color(TQColorGroup::Text) ); // -// if( old != colorGroup().color(TQColorGroup::Text) ) +// if( old != tqcolorGroup().color(TQColorGroup::Text) ) // { -// TQColor c( colorGroup().color(TQColorGroup::Text) ); +// TQColor c( tqcolorGroup().color(TQColorGroup::Text) ); // doc->setMinimumWidth( -1 ); // doc->setDefaultFormat( doc->formatCollection()->defaultFormat()->font(), c ); // lastFormatted = doc->firstParagraph(); @@ -1275,15 +1275,15 @@ void KHexEdit::createCursorPixmaps() int Index = BufferCursor->validIndex(); TQPainter Paint; - Paint.begin( const_cast<TQPixmap*>(&CursorPixmaps->offPixmap()), this ); + Paint.tqbegin( const_cast<TQPixmap*>(&CursorPixmaps->offPixmap()), this ); activeColumn().paintByte( &Paint, Index ); Paint.end(); - Paint.begin( const_cast<TQPixmap*>(&CursorPixmaps->onPixmap()), this ); + Paint.tqbegin( const_cast<TQPixmap*>(&CursorPixmaps->onPixmap()), this ); activeColumn().paintCursor( &Paint, Index ); Paint.end(); - // calculat the shape + // calculat the tqshape KPixelX CursorX; KPixelX CursorW; if( BufferCursor->isBehind() ) @@ -1498,7 +1498,7 @@ void KHexEdit::paintLine( KBufferColumn *C, int Line, KSection Positions ) // to avoid flickers we first paint to the linebuffer TQPainter Paint; - Paint.begin( &LineBuffer, this ); + Paint.tqbegin( &LineBuffer, this ); Paint.translate( C->x(), 0 ); C->paintPositions( &Paint, Line, Positions ); @@ -1671,14 +1671,14 @@ void KHexEdit::contentsMouseReleaseEvent( TQMouseEvent *e ) // was end of selection operation? else if( BufferRanges->hasSelection() ) { - if( TQApplication::clipboard()->supportsSelection() ) + if( TQApplication::tqclipboard()->supportsSelection() ) { ClipboardMode = TQClipboard::Selection; - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, 0); copy(); - connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); + connect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); ClipboardMode = TQClipboard::Clipboard; } } @@ -2005,14 +2005,14 @@ void KHexEdit::contentsContextMenuEvent( TQContextMenuEvent *e ) { selectAll(); // if the clipboard support selections, put the newly selected text into the clipboard - if( TQApplication::clipboard()->supportsSelection() ) + if( TQApplication::tqclipboard()->supportsSelection() ) { ClipboardMode = TQClipboard::Selection; - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, 0); copy(); - connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); + connect( TQApplication::tqclipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); ClipboardMode = TQClipboard::Clipboard; } } diff --git a/khexedit/lib/khexedit.h b/khexedit/lib/khexedit.h index 84193dd..00a25d6 100644 --- a/khexedit/lib/khexedit.h +++ b/khexedit/lib/khexedit.h @@ -19,7 +19,7 @@ #define KHE_KHEXEDIT_H // qt specific -#include <clipboard.h> +#include <tqclipboard.h> // lib specific // #include "khe.h" #include "khexedit_export.h" @@ -130,8 +130,8 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView // void focusOutEvent( TQFocusEvent *FocusEvent ); virtual bool eventFilter( TQObject *O, TQEvent *E ); - virtual TQSize sizeHint() const; - virtual TQSize minimumSizeHint() const; + virtual TQSize tqsizeHint() const; + virtual TQSize tqminimumSizeHint() const; public: // value access @@ -425,7 +425,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView protected: /** recalcs all dependant values with the actual NoOfBytesPerLine */ void adjustToLayoutNoOfBytesPerLine(); - /** recalcs a layout due to the resize style that fits into the view size + /** recalcs a tqlayout due to the resize style that fits into the view size * and updates the dependant values */ void adjustLayoutToSize(); @@ -452,7 +452,7 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView /** Buffer with the data */ KDataBuffer *DataBuffer; - /** holds the logical layout */ + /** holds the logical tqlayout */ KBufferLayout *BufferLayout; /** */ KBufferCursor *BufferCursor; diff --git a/khexedit/lib/koffsetcolumn.cpp b/khexedit/lib/koffsetcolumn.cpp index 43897b1..c2be15a 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->colorGroup().button(); + const TQColor &ButtonColor = View->tqcolorGroup().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->colorGroup().button(); + const TQColor &ButtonColor = View->tqcolorGroup().button(); P->fillRect( Xs.start(), Ys.start(), Xs.width(), Ys.width(), TQBrush(ButtonColor,TQt::SolidPattern) ); } diff --git a/khexedit/lib/koffsetcolumn.h b/khexedit/lib/koffsetcolumn.h index 497d7ef..56b48f1 100644 --- a/khexedit/lib/koffsetcolumn.h +++ b/khexedit/lib/koffsetcolumn.h @@ -81,7 +81,7 @@ class KOffsetColumn : public KColumn /** */ KPixelY DigitBaseLine; - protected: // general layout + protected: // general tqlayout KOffsetFormat::KFormat Format; int CodingWidth; diff --git a/khexedit/lib/kplainbuffer.cpp b/khexedit/lib/kplainbuffer.cpp index 02b9d70..08874ba 100644 --- a/khexedit/lib/kplainbuffer.cpp +++ b/khexedit/lib/kplainbuffer.cpp @@ -72,7 +72,7 @@ int KPlainBuffer::insert( int Pos, const char* D, int Length ) // check all parameters if( Length == 0 ) return 0; - //kdDebug() << TQString("before: Size: %1, RawSize: %2").arg(Size).arg(RawSize) << endl; + //kdDebug() << TQString("before: Size: %1, RawSize: %2").tqarg(Size).tqarg(RawSize) << endl; // correct for appending if( Pos > (int)Size ) Pos = Size; @@ -82,7 +82,7 @@ int KPlainBuffer::insert( int Pos, const char* D, int Length ) // copy new data to its place memcpy( &Data[Pos], D, Length ); - //kdDebug() << TQString("after: Size: %1, RawSize: %2").arg(Size).arg(RawSize) << endl; + //kdDebug() << TQString("after: Size: %1, RawSize: %2").tqarg(Size).tqarg(RawSize) << endl; Modified = true; return Length; diff --git a/khexedit/lib/kvaluecolumn.cpp b/khexedit/lib/kvaluecolumn.cpp index 645dc89..beb706a 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->colorGroup(); + const TQColorGroup &CG = View->tqcolorGroup(); P->fillRect( 0,0,ByteWidth,LineHeight, TQBrush(colorForChar(B),TQt::SolidPattern) ); diff --git a/khexedit/listview.cc b/khexedit/listview.cc index 63f18d8..3217cac 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 = sizeHint(); - setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() + + TQSize s = tqsizeHint(); + setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() + lineWidth() * 2, s.height() ); } } -TQSize CListView::sizeHint( void ) const +TQSize CListView::tqsizeHint( void ) const { - TQSize s = TQListView::sizeHint(); + TQSize s = TQListView::tqsizeHint(); int h = fontMetrics().height() + 2*itemMargin(); if( h % 2 > 0 ) { h++; } - s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height()); + s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height()); return( s ); } #include "listview.moc" diff --git a/khexedit/listview.h b/khexedit/listview.h index b9182bf..975f3da 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 sizeHint( void ) const; + virtual TQSize tqsizeHint( void ) const; private: int mVisibleItem; diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc index 2c3ed6f..a754e72 100644 --- a/khexedit/optiondialog.cc +++ b/khexedit/optiondialog.cc @@ -25,7 +25,7 @@ #include <tqpainter.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqradiobutton.h> #include <tqspinbox.h> @@ -46,9 +46,9 @@ #include <tqobjectlist.h> static void enableWidget( TQWidget *w, bool state ) { - if( w->children() ) + if( w->tqchildren() ) { - TQObjectList *l = (TQObjectList*)w->children(); // silence please + TQObjectList *l = (TQObjectList*)w->tqchildren(); // silence please for( uint i=0; i < l->count(); i++ ) { TQObject *o = l->at(i); @@ -260,7 +260,7 @@ void COptionDialog::setupCursorPage( void ) TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQVButtonGroup *group = new TQVButtonGroup( i18n("Blinking"), page ); - group->layout()->setMargin( spacingHint() ); + group->tqlayout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("Do not b&link"); @@ -282,7 +282,7 @@ void COptionDialog::setupCursorPage( void ) TQT_SLOT( slotChanged())); group = new TQVButtonGroup( i18n("Shape"), page ); - group->layout()->setMargin( spacingHint() ); + group->tqlayout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("Always &use block (rectangular) cursor"); @@ -298,7 +298,7 @@ void COptionDialog::setupCursorPage( void ) text = i18n("Cursor Behavior When Editor Loses Focus"); group = new TQVButtonGroup( text, page ); - group->layout()->setMargin( spacingHint() ); + group->tqlayout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("&Stop blinking (if blinking is enabled)"); @@ -351,7 +351,7 @@ void COptionDialog::setupColorPage( void ) modeList.append( i18n("Marked Background") ); modeList.append( i18n("Marked Text") ); modeList.append( i18n("Cursor Background") ); - modeList.append( i18n("Cursor Text (block shape)") ); + modeList.append( i18n("Cursor Text (block tqshape)") ); modeList.append( i18n("Bookmark Background") ); modeList.append( i18n("Bookmark Text") ); modeList.append( i18n("Separator") ); @@ -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->sizeHint().width() ); + mFile.openCombo->setMinimumWidth( mFile.openCombo->tqsizeHint().width() ); connect( mFile.openCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT( slotChanged())); @@ -548,7 +548,7 @@ void COptionDialog::setupMiscPage( void ) this, TQT_SLOT( slotChanged())); TQVButtonGroup *group = new TQVButtonGroup( i18n("Sounds"), page ); - group->layout()->setMargin( spacingHint() ); + group->tqlayout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("Make sound on data &input (eg. typing) failure"); mMisc.inputCheck = new TQCheckBox( text, group ); @@ -560,7 +560,7 @@ void COptionDialog::setupMiscPage( void ) this, TQT_SLOT( slotChanged())); group = new TQVButtonGroup( i18n("Bookmark Visibility"), page ); - group->layout()->setMargin( spacingHint() ); + group->tqlayout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("Use visible bookmarks in the offset column"); mMisc.bookmarkColumnCheck = new TQCheckBox( text, group ); @@ -696,9 +696,9 @@ void COptionDialog::slotDefault( void ) { case page_layout: { - SDisplayLayout layout; + SDisplayLayout tqlayout; SDisplayLine line; - setLayout( layout, line ); + setLayout( tqlayout, line ); } break; @@ -758,7 +758,7 @@ void COptionDialog::slotApply( void ) mDisplayState.line.setColumnSize(index, mLayout.columnSizeSpin->value()); emit lineSizeChoice( mDisplayState.line ); - SDisplayLayout &l = mDisplayState.layout; + SDisplayLayout &l = mDisplayState.tqlayout; l.lockLine = mLayout.lockLineCheck->isChecked(); l.lockColumn = mLayout.lockColumnCheck->isChecked(); l.leftSeparatorWidth = mLayout.leftSepWidthSpin->value(); @@ -789,7 +789,7 @@ void COptionDialog::slotApply( void ) l.horzGridWidth = l.vertGridWidth = 1; } - emit layoutChoice( mDisplayState.layout ); + emit layoutChoice( mDisplayState.tqlayout ); } break; @@ -883,35 +883,35 @@ void COptionDialog::slotApply( void ) configChanged = false; } -void COptionDialog::setLayout( SDisplayLayout &layout, SDisplayLine &line ) +void COptionDialog::setLayout( SDisplayLayout &tqlayout, SDisplayLine &line ) { mDisplayState.line = line; - mDisplayState.layout = layout; + mDisplayState.tqlayout = tqlayout; slotModeSelectorChanged( mLayout.formatCombo->currentItem() ); - mLayout.lockLineCheck->setChecked( layout.lockLine ); - mLayout.lockColumnCheck->setChecked( layout.lockColumn ); - mLayout.leftSepWidthSpin->setValue( layout.leftSeparatorWidth ); - mLayout.rightSepWidthSpin->setValue( layout.rightSeparatorWidth ); - mLayout.separatorSpin->setValue( layout.separatorMarginWidth ); - mLayout.edgeSpin->setValue( layout.edgeMarginWidth ); - mLayout.leftSepWidthSpin->setValue( layout.leftSeparatorWidth ); - mLayout.rightSepWidthSpin->setValue( layout.rightSeparatorWidth ); - mLayout.columnCheck->setChecked( layout.columnCharSpace ); - slotColumnSepCheck( layout.columnCharSpace ); - mLayout.columnSepSpin->setValue( layout.columnSpacing ); - - if( layout.horzGridWidth == 0 && layout.vertGridWidth == 0 ) + mLayout.lockLineCheck->setChecked( tqlayout.lockLine ); + mLayout.lockColumnCheck->setChecked( tqlayout.lockColumn ); + mLayout.leftSepWidthSpin->setValue( tqlayout.leftSeparatorWidth ); + mLayout.rightSepWidthSpin->setValue( tqlayout.rightSeparatorWidth ); + mLayout.separatorSpin->setValue( tqlayout.separatorMarginWidth ); + mLayout.edgeSpin->setValue( tqlayout.edgeMarginWidth ); + mLayout.leftSepWidthSpin->setValue( tqlayout.leftSeparatorWidth ); + mLayout.rightSepWidthSpin->setValue( tqlayout.rightSeparatorWidth ); + mLayout.columnCheck->setChecked( tqlayout.columnCharSpace ); + slotColumnSepCheck( tqlayout.columnCharSpace ); + mLayout.columnSepSpin->setValue( tqlayout.columnSpacing ); + + if( tqlayout.horzGridWidth == 0 && tqlayout.vertGridWidth == 0 ) { mLayout.gridCombo->setCurrentItem(0); } - else if( layout.horzGridWidth != 0 && layout.vertGridWidth != 0 ) + else if( tqlayout.horzGridWidth != 0 && tqlayout.vertGridWidth != 0 ) { mLayout.gridCombo->setCurrentItem(3); } else { - mLayout.gridCombo->setCurrentItem( layout.vertGridWidth != 0 ? 1 : 2 ); + mLayout.gridCombo->setCurrentItem( tqlayout.vertGridWidth != 0 ? 1 : 2 ); } } @@ -1021,7 +1021,7 @@ void COptionDialog::setFile( SDisplayMisc &misc ) void COptionDialog::setState( SDisplayState &state ) { - setLayout( state.layout, state.line ); + setLayout( state.tqlayout, state.line ); setCursor( state.cursor ); setColor( state.color ); setFont( state.font ); diff --git a/khexedit/optiondialog.h b/khexedit/optiondialog.h index f44aade..0a54dab 100644 --- a/khexedit/optiondialog.h +++ b/khexedit/optiondialog.h @@ -110,7 +110,7 @@ class COptionDialog : public KDialogBase COptionDialog( TQWidget *parent = 0, char *name = 0, bool modal = false ); ~COptionDialog( void ); - void setLayout( SDisplayLayout &layout, SDisplayLine &line ); + void setLayout( SDisplayLayout &tqlayout, SDisplayLine &line ); void setCursor( SDisplayCursor &cursor ); void setColor( SDisplayColor &color ); void setFont( SDisplayFont &font ); @@ -238,7 +238,7 @@ class COptionDialog : public KDialogBase signals: void lineSizeChoice( const SDisplayLine &lineSize ); - void layoutChoice( const SDisplayLayout &layout ); + void layoutChoice( const SDisplayLayout &tqlayout ); void cursorChoice( const SDisplayCursor &cursor ); void colorChoice( const SDisplayColor &color ); void fontChoice( const SDisplayFont &font ); diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp index b32e5f7..cb2b549 100644 --- a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp +++ b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp @@ -16,7 +16,7 @@ // qt specific -#include <layout.h> +#include <tqlayout.h> // kde specific #include <klocale.h> #include <kgenericfactory.h> diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.h b/khexedit/parts/kbytesedit/kbyteseditwidget.h index 42ae126..1f44fbf 100644 --- a/khexedit/parts/kbytesedit/kbyteseditwidget.h +++ b/khexedit/parts/kbytesedit/kbyteseditwidget.h @@ -86,7 +86,7 @@ class KBytesEditWidget : public TQWidget, public KHE::BytesEditInterface, virtual bool isOverwriteOnly() const; virtual bool isReadOnly() const; virtual bool isModified() const; - /** repaint the indizes from i1 to i2 */ + /** tqrepaint the indizes from i1 to i2 */ virtual void repaintRange( int i1, int i2 ); public: // cursor interface @@ -94,7 +94,7 @@ class KBytesEditWidget : public TQWidget, public KHE::BytesEditInterface, virtual void setCursorPosition( int Index ); // virtual bool tabChangesFocus() const; - public: // layout interface ?? + public: // tqlayout interface ?? /** sets the resizestyle for the value column. Default is KHE::FullSizeUsage */ virtual void setResizeStyle( KResizeStyle Style ); /** sets the number of bytes per line, switching the resize style to KHE::NoResize */ diff --git a/khexedit/printdialogpage.cc b/khexedit/printdialogpage.cc index 1d8e166..cc01c8a 100644 --- a/khexedit/printdialogpage.cc +++ b/khexedit/printdialogpage.cc @@ -18,7 +18,7 @@ * */ -#include <layout.h> +#include <tqlayout.h> #include <tqbuttongroup.h> #include <tqspinbox.h> #include <tqlabel.h> @@ -78,14 +78,14 @@ void LayoutDialogPage::setupLayoutPage( void ) { mLayout.marginSpin[i] = new TQSpinBox( group ); mLayout.marginSpin[i]->setFixedHeight( - mLayout.marginSpin[i]->sizeHint().height() ); + mLayout.marginSpin[i]->tqsizeHint().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]->sizeHint().height() ); - label->setFixedWidth( label->sizeHint().width() ); + label->setFixedHeight( mLayout.marginSpin[i]->tqsizeHint().height() ); + label->setFixedWidth( label->tqsizeHint().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->sizeHint() ); + mLayout.headerCheck->setFixedSize( mLayout.headerCheck->tqsizeHint() ); 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]->sizeHint().height() ); + mLayout.headerCombo[i]->tqsizeHint().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]->sizeHint().height() ); + mLayout.headerLabel[i]->tqsizeHint().height() ); mLayout.headerLabel[i]->setFixedWidth( - mLayout.headerLabel[i]->sizeHint().width() ); + mLayout.headerLabel[i]->tqsizeHint().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->sizeHint() ); + mLayout.footerCheck->setFixedSize( mLayout.footerCheck->tqsizeHint() ); 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]->sizeHint().height() ); + mLayout.footerCombo[i]->tqsizeHint().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]->sizeHint().height() ); + mLayout.footerLabel[i]->tqsizeHint().height() ); mLayout.footerLabel[i]->setFixedWidth( - mLayout.footerLabel[i]->sizeHint().width() ); + mLayout.footerLabel[i]->tqsizeHint().width() ); if( i<3 ) { diff --git a/khexedit/searchbar.cc b/khexedit/searchbar.cc index 000a400..3122980 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->sizeHint().height() ); + mFindButton->setFixedHeight( mTypeCombo->tqsizeHint().height() ); mBackwards = new TQCheckBox( i18n("Backwards"), this ); mIgnoreCase = new TQCheckBox( i18n("Ignore case"), this ); @@ -85,7 +85,7 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f ) connect( mCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideWidget()) ); // - // Make layout + // Make tqlayout // TQHBoxLayout *hlay = new TQHBoxLayout( this, 4, 6 ); hlay->addWidget( mTypeCombo ); diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cc index ebdaaba..ca1e918 100644 --- a/khexedit/statusbarprogress.cc +++ b/khexedit/statusbarprogress.cc @@ -67,10 +67,10 @@ void CStatusBarProgress::initialize( void ) mBarPixmap = 0; mBarStyle = Solid; - mBarColor = palette().active().highlight(); - mBarTextColor = palette().active().highlightedText(); - mTextColor = palette().active().text(); - setBackgroundColor( palette().active().background() ); + mBarColor = tqpalette().active().highlight(); + mBarTextColor = tqpalette().active().highlightedText(); + mTextColor = tqpalette().active().text(); + setBackgroundColor( tqpalette().active().background() ); TQFont font( KGlobalSettings::generalFont() ); font.setBold( true ); @@ -176,7 +176,7 @@ bool CStatusBarProgress::textEnabled( void ) const return( mTextEnabled ); } -TQSize CStatusBarProgress::sizeHint( void ) const +TQSize CStatusBarProgress::tqsizeHint( void ) const { TQSize s( size() ); @@ -212,13 +212,13 @@ int CStatusBarProgress::recalcValue(int range) void CStatusBarProgress::valueChange() { - repaint(contentsRect(), FALSE); + tqrepaint(contentsRect(), FALSE); emit percentageChanged(recalcValue(100)); } void CStatusBarProgress::rangeChange() { - repaint(contentsRect(), FALSE); + tqrepaint(contentsRect(), FALSE); emit percentageChanged(recalcValue(100)); } @@ -246,10 +246,10 @@ void CStatusBarProgress::adjustStyle( void ) void CStatusBarProgress::paletteChange( const TQPalette & ) { - mBarColor = palette().active().highlight(); - mBarTextColor = palette().active().highlightedText(); - mTextColor = palette().active().text(); - setBackgroundColor( palette().active().background() ); + mBarColor = tqpalette().active().highlight(); + mBarTextColor = tqpalette().active().highlightedText(); + mTextColor = tqpalette().active().text(); + setBackgroundColor( tqpalette().active().background() ); } void CStatusBarProgress::drawText( TQPainter *p ) @@ -259,17 +259,17 @@ void CStatusBarProgress::drawText( TQPainter *p ) if( mMsg.isEmpty() == true ) { - s = TQString("%1%").arg(recalcValue(100)); + s = TQString("%1%").tqarg(recalcValue(100)); } else { if( mCurPage > 0 ) { - s = i18n("%1... %2 of %3").arg(mMsg).arg(mCurPage).arg(mMaxPage); + s = i18n("%1... %2 of %3").tqarg(mMsg).tqarg(mCurPage).tqarg(mMaxPage); } else { - s = i18n("%1... %2%").arg(mMsg).arg(recalcValue(100)); + s = i18n("%1... %2%").tqarg(mMsg).tqarg(recalcValue(100)); } } diff --git a/khexedit/statusbarprogress.h b/khexedit/statusbarprogress.h index 531c9aa..f477055 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 sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cc index 5564cbd..efd0933 100644 --- a/khexedit/stringdialog.cc +++ b/khexedit/stringdialog.cc @@ -20,7 +20,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <tqspinbox.h> @@ -372,8 +372,8 @@ void CStringDialog::appendListItem( const TQString &str, uint offsetLen ) void CStringDialog::updateListInfo( void ) { - mListSizeLabel->setText( TQString("%1").arg(mStringData.count()) ); - mDisplaySizeLabel->setText( TQString("%1").arg(mStringList->childCount()) ); + mListSizeLabel->setText( TQString("%1").tqarg(mStringData.count()) ); + mDisplaySizeLabel->setText( TQString("%1").tqarg(mStringList->childCount()) ); setColumnWidth(); } diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc index 2297c62..351a35d 100644 --- a/khexedit/toplevel.cc +++ b/khexedit/toplevel.cc @@ -391,7 +391,7 @@ void KHexEdit::initialize( bool openFiles ) maxItems = 1; for( unsigned int i = 1 ; i <= maxItems ; i++ ) { - const TQString key = TQString( "File%1" ).arg( i ); + const TQString key = TQString( "File%1" ).tqarg( i ); const TQString value = config->readPathEntry( key ); if (!value.isEmpty()) @@ -533,7 +533,7 @@ void KHexEdit::slotFileOpenRecent( const KURL& url ) else { // ### TODO: support network transparency - KMessageBox::error( this, i18n("Non local recent file: %1").arg( url.prettyURL() ) ); + KMessageBox::error( this, i18n("Non local recent file: %1").tqarg( url.prettyURL() ) ); } } @@ -545,7 +545,7 @@ KHexEdit *KHexEdit::newWindow( void ) { TQString msg = i18n( "Can not create new window.\n" ); msg += hexError( Err_NoMemory ); - KMessageBox::error( topLevelWidget(), msg ); + KMessageBox::error( tqtopLevelWidget(), 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( topLevelWidget(), msg, TQString(), KStdGuiItem::quit() ); + int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg, TQString(), KStdGuiItem::quit() ); if( reply == KMessageBox::Continue ) { break; @@ -755,11 +755,11 @@ void KHexEdit::cursorChanged( SCursorState &state ) } else { - SDisplayLayout &layout = editor()->layout(); + SDisplayLayout &tqlayout = editor()->tqlayout(); - if( layout.offsetMode == SDisplayLayout::hexadecimal ) + if( tqlayout.offsetMode == SDisplayLayout::hexadecimal ) { - if( layout.offsetUpperCase == false ) + if( tqlayout.offsetUpperCase == false ) { offset += TQString().sprintf( " %04x:%04x-%u", state.offset>>16, state.offset&0x0000FFFF, state.cell ); @@ -788,7 +788,7 @@ void KHexEdit::fileState( SFileState &state ) { if( state.valid == true ) { - statusBar()->changeItem( i18n("Size: %1").arg( state.size ), status_Size); + statusBar()->changeItem( i18n("Size: %1").tqarg( state.size ), status_Size); statusBar()->changeItem( state.modified ? "!" : "", status_Modified); if( mIsModified != state.modified ) @@ -807,23 +807,23 @@ void KHexEdit::fileState( SFileState &state ) -void KHexEdit::layoutChanged( const SDisplayLayout &layout ) +void KHexEdit::layoutChanged( const SDisplayLayout &tqlayout ) { KRadioAction *radioAction; - if( layout.primaryMode == SDisplayLayout::hexadecimal ) + if( tqlayout.primaryMode == SDisplayLayout::hexadecimal ) { radioAction = mAction.hexadecimal; } - else if( layout.primaryMode == SDisplayLayout::decimal ) + else if( tqlayout.primaryMode == SDisplayLayout::decimal ) { radioAction = mAction.decimal; } - else if( layout.primaryMode == SDisplayLayout::octal ) + else if( tqlayout.primaryMode == SDisplayLayout::octal ) { radioAction = mAction.octal; } - else if( layout.primaryMode == SDisplayLayout::binary ) + else if( tqlayout.primaryMode == SDisplayLayout::binary ) { radioAction = mAction.binary; } @@ -841,15 +841,15 @@ void KHexEdit::layoutChanged( const SDisplayLayout &layout ) mAction.dataUppercase->blockSignals(true); mAction.offsetUppercase->blockSignals(true); - mAction.showOffsetColumn->setChecked( layout.offsetVisible ); + mAction.showOffsetColumn->setChecked( tqlayout.offsetVisible ); mAction.showTextColumn->setEnabled( - layout.primaryMode != SDisplayLayout::textOnly ); + tqlayout.primaryMode != SDisplayLayout::textOnly ); mAction.showTextColumn->setChecked( - layout.secondaryMode != SDisplayLayout::hide ); + tqlayout.secondaryMode != SDisplayLayout::hide ); mAction.offsetAsDecimal->setChecked( - layout.offsetMode != SDisplayLayout::hexadecimal); - mAction.dataUppercase->setChecked( layout.primaryUpperCase ); - mAction.offsetUppercase->setChecked( layout.offsetUpperCase ); + tqlayout.offsetMode != SDisplayLayout::hexadecimal); + mAction.dataUppercase->setChecked( tqlayout.primaryUpperCase ); + mAction.offsetUppercase->setChecked( tqlayout.offsetUpperCase ); mAction.showOffsetColumn->blockSignals(false); mAction.showTextColumn->blockSignals(false); @@ -857,23 +857,23 @@ void KHexEdit::layoutChanged( const SDisplayLayout &layout ) mAction.dataUppercase->blockSignals(false); mAction.offsetUppercase->blockSignals(false); - if( layout.primaryMode == SDisplayLayout::hexadecimal ) + if( tqlayout.primaryMode == SDisplayLayout::hexadecimal ) { statusBar()->changeItem( i18n("Hex"), status_Layout ); } - else if( layout.primaryMode == SDisplayLayout::decimal ) + else if( tqlayout.primaryMode == SDisplayLayout::decimal ) { statusBar()->changeItem( i18n("Dec"), status_Layout ); } - else if( layout.primaryMode == SDisplayLayout::octal ) + else if( tqlayout.primaryMode == SDisplayLayout::octal ) { statusBar()->changeItem( i18n("Oct"), status_Layout ); } - else if( layout.primaryMode == SDisplayLayout::binary ) + else if( tqlayout.primaryMode == SDisplayLayout::binary ) { statusBar()->changeItem( i18n("Bin"), status_Layout ); } - else if( layout.primaryMode == SDisplayLayout::textOnly ) + else if( tqlayout.primaryMode == SDisplayLayout::textOnly ) { statusBar()->changeItem( i18n("Txt"), status_Layout ); } @@ -922,7 +922,7 @@ void KHexEdit::bookmarkChanged( TQPtrList<SCursorOffset> &list ) for( SCursorOffset *p=list.first(); p!=0; p=list.next(), i++ ) { offset.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF ); - text = i18n("Offset: %1").arg(offset); + text = i18n("Offset: %1").tqarg(offset); KAction *action = new KAction(text, 0, mAction.bookmarkMapper, TQT_SLOT(map()), TQT_TQOBJECT(this), text.latin1()); int key = acceleratorNumKey( i ); if( key > 0 ) @@ -1021,7 +1021,7 @@ void KHexEdit::encodingChanged( const SEncodeState &encodeState ) if( mSelectionSize == 0 ) { - statusBar()->changeItem( i18n("Encoding: %1").arg(encodeState.name), + statusBar()->changeItem( i18n("Encoding: %1").tqarg(encodeState.name), status_Selection ); } } @@ -1186,7 +1186,7 @@ void KHexEdit::setSelectionText( uint selectionOffset, uint selectionSize ) else { statusBar()->changeItem( - i18n("Encoding: %1").arg(hexView()->encoding().name), status_Selection); + i18n("Encoding: %1").tqarg(hexView()->encoding().name), status_Selection); } } diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h index 6a8db9b..5e72dee 100644 --- a/khexedit/toplevel.h +++ b/khexedit/toplevel.h @@ -157,7 +157,7 @@ class KHexEdit : public KMainWindow void operationChanged( bool state ); void cursorChanged( SCursorState &state ); void fileState( SFileState &state ); - void layoutChanged( const SDisplayLayout &layout ); + void layoutChanged( const SDisplayLayout &tqlayout ); void inputModeChanged( const SDisplayInputMode &mode ); void bookmarkChanged( TQPtrList<SCursorOffset> &list ); void removeRecentFile( const TQString &fileName ); @@ -249,7 +249,7 @@ protected: inline void KHexEdit::addStartupFile( const TQString &fileName ) { mStartupFileList.prepend( fileName ); - mStartupOffsetList.prepend( TQString("%1").arg(mStartupOffset,0,16) ); + mStartupOffsetList.prepend( TQString("%1").tqarg(mStartupOffset,0,16) ); mStartupOffset = 0; } diff --git a/kjots/CHANGES b/kjots/CHANGES index 9815d90..a4cc4ff 100644 --- a/kjots/CHANGES +++ b/kjots/CHANGES @@ -15,12 +15,12 @@ new in version 0.5 (Aaron J. Seigo) new in version 0.4 (Mario Weilguni <mweilguni@kde.org>) - works now with Qt 2.0 -- fixed broken layout of main window -- layout improvements in AskFileName() -- layout improvements in SubjList() +- fixed broken tqlayout of main window +- tqlayout improvements in AskFileName() +- tqlayout improvements in SubjList() - compiles without warnings - "Apply" button is only activated when changes were made -- improved layout of configuration dialog +- improved tqlayout of configuration dialog - fixed a bug in the font selection - now compiles with EGCS ( Robert Williams ) @@ -59,7 +59,7 @@ new in version 0.2.1 new in version 0.2.0 -- changed the layout to be more KDE conforming (toolbar, statusbar,...) +- changed the tqlayout to be more KDE conforming (toolbar, statusbar,...) - folders are now called books and entries are pages - added subject to each page - you may popup a window with a list of all subjects and use it to find diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp index f2dfa97..2feb47a 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->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); + subjectList->tqsetSizePolicy(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->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1)); + splitter->tqsetSizePolicy(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(topLevelWidget(), msg.arg(b->subject()), i18n("Delete Book"),KStdGuiItem::del()); + int result = KMessageBox::warningContinueCancel(tqtopLevelWidget(), msg.tqarg(b->subject()), i18n("Delete Book"),KStdGuiItem::del()); if (result!=KMessageBox::Continue) return; @@ -358,9 +358,9 @@ void KJotsMain::deleteEntry() KJotsPage* cur = currentPage(); if (!cur || - KMessageBox::warningContinueCancel(topLevelWidget(), + KMessageBox::warningContinueCancel(tqtopLevelWidget(), i18n("<qt>Are you sure you want to delete the <strong>%1</strong> page?</qt>") - .arg(cur->subject()), + .tqarg(cur->subject()), i18n("Delete Page"),KStdGuiItem::del()) != KMessageBox::Continue) { return; @@ -493,7 +493,7 @@ void KJotsMain::saveBookToFile(bool plainText) } if (!KIO::NetAccess::exists(res.URLs[0], true, this) || - KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) + KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").tqarg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) { tryAgain = false; } @@ -534,7 +534,7 @@ void KJotsMain::savePageToFile(bool plainText) } if (!KIO::NetAccess::exists(res.URLs[0], true, this) || - KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) + KMessageBox::warningYesNo(this, "<qt>" + i18n("The file <strong>%1</strong> already exists. Do you wish to overwrite it?").tqarg(res.URLs[0].prettyURL()) + "</qt>", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) { tryAgain = false; } @@ -573,7 +573,7 @@ void KJotsMain::slotQuit() void KJotsMain::insertDate() { - me_text->insert(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(), true) + " "); + me_text->insert(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(), true) + " "); } void KJotsMain::updateMenu() diff --git a/kjots/KJotsMain.h b/kjots/KJotsMain.h index 1285f06..61c830b 100644 --- a/kjots/KJotsMain.h +++ b/kjots/KJotsMain.h @@ -23,7 +23,7 @@ #ifndef KJotsMain_included #define KJotsMain_included -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <kdialogbase.h> diff --git a/kjots/confpagemisc.ui b/kjots/confpagemisc.ui index f717a48..4a45efb 100644 --- a/kjots/confpagemisc.ui +++ b/kjots/confpagemisc.ui @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp index 643fd92..eff6cba 100644 --- a/kjots/kjotsedit.cpp +++ b/kjots/kjotsedit.cpp @@ -135,7 +135,7 @@ void KJotsEdit::setEntry (KJotsPage *entry) m_entry = entry; setText(entry->body()); removeSelection(); - repaint(); + tqrepaint(); setEnabled(true); setFocus(); entry->setEditor(this); diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp index fa35c86..53613c3 100644 --- a/kjots/kjotsentry.cpp +++ b/kjots/kjotsentry.cpp @@ -23,7 +23,7 @@ #include <tqdir.h> #include <tqpainter.h> #include <tqpaintdevicemetrics.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqdom.h> #include <kapplication.h> @@ -532,9 +532,9 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding) //revisions will likely use it. I don't want to make the translators add, remove, //and re-add translations, so I'm just keeping this here for now. m_saveProgressDialog = new KProgressDialog(listView(), "bookSaveInProgress", - i18n("Saving %1").arg(subject()), + i18n("Saving %1").tqarg(subject()), i18n("Saving the contents of %1 to %2") - .arg(subject(), url.prettyURL()), + .tqarg(subject(), url.prettyURL()), true); m_saveProgressDialog->progressBar()->setTotalSteps(1); @@ -613,7 +613,7 @@ void KJotsBook::print(TQFont& defaultFont) printer.setFullPage(false); printer.setCreator("KJots"); - if (!printer.setup(listView(), i18n("Print: %1").arg(subject()))) + if (!printer.setup(listView(), i18n("Print: %1").tqarg(subject()))) { return; } @@ -657,7 +657,7 @@ bool KJotsBook::isDirty() //Am I dirty? if ( KJotsEntryBase::isDirty() ) return true; - //Check all children to see if any of them are dirty + //Check all tqchildren to see if any of them are dirty KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(firstChild()); while ( entry ) { @@ -763,7 +763,7 @@ TQString KJotsBook::getToc() KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(firstChild()); while ( entry ) { TQString htmlSubject = prepForHTML(entry->subject()); - toc += TQString("<li><a href=\"#%1\">").arg(entry->id()) + htmlSubject + "</a></li>"; + toc += TQString("<li><a href=\"#%1\">").tqarg(entry->id()) + htmlSubject + "</a></li>"; KJotsBook *book = dynamic_cast<KJotsBook*>(entry); if ( book ) toc += book->getToc(); @@ -787,13 +787,13 @@ TQString KJotsBook::generateHtml( KJotsEntryBase* top, bool diskMode ) if ( top == this ) { - toc = TQString("<h1><a name=\"%1\">%2</a></h1>").arg(id()).arg(htmlTitle); + toc = TQString("<h1><a name=\"%1\">%2</a></h1>").tqarg(id()).tqarg(htmlTitle); } else { if ( diskMode ) { - toc = TQString("<h2><a name=\"%1\">%2</a></h2>").arg(id()).arg(htmlTitle); + toc = TQString("<h2><a name=\"%1\">%2</a></h2>").tqarg(id()).tqarg(htmlTitle); } else { - toc = TQString("<h2><a name=\"%1\" href=\"%2\">%3</a></h2>").arg(id()).arg(id()).arg(htmlTitle); + toc = TQString("<h2><a name=\"%1\" href=\"%2\">%3</a></h2>").tqarg(id()).tqarg(id()).tqarg(htmlTitle); } } @@ -995,7 +995,7 @@ void KJotsPage::print(TQFont& defaultFont) printer.setFullPage(false); printer.setCreator("KJots"); - if (printer.setup(listView(), i18n("Print: %1").arg(docName))) + if (printer.setup(listView(), i18n("Print: %1").tqarg(docName))) { TQPainter painter( &printer ); painter.setFont(defaultFont); @@ -1066,7 +1066,7 @@ TQString KJotsPage::defaultSubject() page = 1; } - return i18n("Page %1").arg(page); + return i18n("Page %1").tqarg(page); } /*! @@ -1181,21 +1181,21 @@ TQString KJotsPage::generateHtml( KJotsEntryBase *top, bool diskMode ) TQString htmlSubject = prepForHTML(subject()); if ( top == this || diskMode ) { - html += TQString("<h3><a name=\"%1\">%2</a></h3>").arg(id()).arg(htmlSubject); + html += TQString("<h3><a name=\"%1\">%2</a></h3>").tqarg(id()).tqarg(htmlSubject); } else { - html += TQString("<h3><a name=\"%1\" href=\"%2\">%3</a></h3>").arg(id()).arg(id()).arg(htmlSubject); + html += TQString("<h3><a name=\"%1\" href=\"%2\">%3</a></h3>").tqarg(id()).tqarg(id()).tqarg(htmlSubject); } html += prepForHTML(body()); html += "<br><table border=1><tr>"; - html += TQString("<td><a href=\"#%1\">%2</a></td>").arg(id()).arg(subject()); + html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(id()).tqarg(subject()); if ( top != this ) { KJotsBook *parent = parentBook(); while ( parent ) { - html += TQString("<td><a href=\"#%1\">%2</a></td>").arg(parent->id()).arg(parent->subject()); + html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(parent->id()).tqarg(parent->subject()); if ( parent == top ) break; parent = parent->parentBook(); } diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp index be1c18a..44c1822 100644 --- a/klaptopdaemon/acpi.cpp +++ b/klaptopdaemon/acpi.cpp @@ -40,7 +40,7 @@ #include <kprocess.h> // other TQt headers: -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqhbox.h> @@ -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->setAlignment( TQt::WordBreak ); + tmp_label->tqsetAlignment( 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->setAlignment( TQt::WordBreak ); + tmp_label->tqsetAlignment( 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->setAlignment( TQt::WordBreak ); + tmp_label->tqsetAlignment( 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->setAlignment( TQt::WordBreak ); + tmp_label->tqsetAlignment( TQt::WordBreak ); top_layout->addWidget( tmp_label ); ll = new TQHBoxLayout(); TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this); @@ -145,7 +145,7 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) top_layout->addStretch(1); - top_layout->addWidget( new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this), 0, TQt::AlignRight ); + top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this), 0, TQt::AlignRight ); load(); diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp index 742f88a..3869457 100644 --- a/klaptopdaemon/apm.cpp +++ b/klaptopdaemon/apm.cpp @@ -41,7 +41,7 @@ #include <kprocess.h> // other TQt headers: -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqhbox.h> @@ -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->setAlignment( TQt::WordBreak ); + tmp_label->tqsetAlignment( 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->setAlignment( TQt::WordBreak ); + tmp_label->tqsetAlignment( 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->setAlignment( TQt::WordBreak ); + tmp_label->tqsetAlignment( TQt::WordBreak ); top_layout->addWidget( tmp_label ); bool can_enable = laptop_portable::has_apm(1); // is helper ready @@ -100,8 +100,8 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) "ways you can enable this application, either make the file " "/proc/apm writeable by anyone every time your system boots " "or use the button below to make the %1 application " - "set-uid root").arg(apm_name), this ); - tmp_label->setAlignment( TQt::WordBreak ); + "set-uid root").tqarg(apm_name), this ); + tmp_label->tqsetAlignment( 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->setAlignment( TQt::WordBreak ); + tmp_label->tqsetAlignment( 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->setAlignment( TQt::WordBreak ); + tmp_label->tqsetAlignment( TQt::WordBreak ); top_layout->addWidget( tmp_label ); ll = new TQHBoxLayout(this); TQPushButton *setupSSButton = new TQPushButton(i18n("Setup SS Helper Application"), this); @@ -141,7 +141,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) top_layout->addStretch(1); - top_layout->addWidget( new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this), 0, TQt::AlignRight ); + top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this), 0, TQt::AlignRight ); load(); @@ -158,7 +158,7 @@ void ApmConfig::setupHelper() if (!tdesu.isEmpty()) { int rc = KMessageBox::warningContinueCancel(0, i18n("You will need to supply a root password " - "to allow the privileges of the %1 application to change.").arg(apm_name), + "to allow the privileges of the %1 application to change.").tqarg(apm_name), "KLaptopDaemon", KStdGuiItem::cont(), ""); if (rc == KMessageBox::Continue) { @@ -170,7 +170,7 @@ void ApmConfig::setupHelper() proc.start(KProcess::Block); // run it sync so has_apm below sees the results } } else { - KMessageBox::sorry(0, i18n("%1 cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly.").arg(TQString(apm_name)), + KMessageBox::sorry(0, i18n("%1 cannot be enabled because tdesu cannot be found. Please make sure that it is installed correctly.").tqarg(TQString(apm_name)), i18n("KLaptopDaemon")); } laptop_portable::apm_set_mask(enablestandby, enablesuspend); diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp index 2d62ca7..5e2c279 100644 --- a/klaptopdaemon/battery.cpp +++ b/klaptopdaemon/battery.cpp @@ -39,7 +39,7 @@ #include <krichtextlabel.h> // other TQt headers: -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqhbox.h> @@ -112,10 +112,10 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) // group box to hold the icons together TQVGroupBox* icons_groupbox = new TQVGroupBox( i18n("Select Battery Icons"), this ); - icons_groupbox->layout()->setSpacing( KDialog::spacingHint() ); + icons_groupbox->tqlayout()->setSpacing( KDialog::spacingHint() ); top_layout->addWidget( icons_groupbox, 0, TQt::AlignLeft ); - // layout to hold the icons inside the groupbox + // tqlayout to hold the icons inside the groupbox TQGrid *icon_grid = new TQGrid( 3 /*cols*/, icons_groupbox ); icon_grid->setSpacing( KDialog::spacingHint() ); diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp index 898e480..b00fbc4 100644 --- a/klaptopdaemon/buttons.cpp +++ b/klaptopdaemon/buttons.cpp @@ -34,7 +34,7 @@ #include <kapplication.h> #include <kcombobox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvbuttongroup.h> #include <tqspinbox.h> #include <tqradiobutton.h> @@ -120,7 +120,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) if (laptop_portable::has_button(laptop_portable::LidButton)) { lidBox = new TQVButtonGroup(i18n("Lid Switch Closed"), this); - lidBox->layout()->setSpacing( KDialog::spacingHint() ); + lidBox->tqlayout()->setSpacing( KDialog::spacingHint() ); TQToolTip::add( lidBox, i18n( "Select which actions will occur when the laptop's lid is closed" ) ); hlay->addWidget( lidBox ); @@ -196,7 +196,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) if (laptop_portable::has_button(laptop_portable::PowerButton)) { powerBox = new TQVButtonGroup(i18n("Power Switch Pressed"), this); - powerBox->layout()->setSpacing( KDialog::spacingHint() ); + powerBox->tqlayout()->setSpacing( KDialog::spacingHint() ); TQToolTip::add( powerBox, i18n( "Select which actions will occur when the laptop's power button is pressed" ) ); hlay->addWidget( powerBox ); @@ -273,12 +273,12 @@ 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->setAlignment( TQt::WordBreak ); + explain->tqsetAlignment( TQt::WordBreak ); top_layout->addWidget(explain); top_layout->addStretch(1); - top_layout->addWidget( new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this ), 0, TQt::AlignRight ); + top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this ), 0, TQt::AlignRight ); } } diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index d907ef2..7c948b7 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->sizeHint()); + brightness_widget->resize(brightness_widget->tqsizeHint()); } else { brightness_slider->setValue(255-brightness); } @@ -215,7 +215,7 @@ laptop_dock::invokeBrightness() TQPoint pos = TQCursor::pos(); int x = pos.x(); int y = pos.y(); - y -= brightness_widget->geometry().height(); + y -= brightness_widget->tqgeometry().height(); int w = brightness_widget->width(); int h = brightness_widget->height(); if (x+w > sw) @@ -375,10 +375,10 @@ void laptop_dock::mousePressEvent( TQMouseEvent *event ) TQString num3; num3.setNum(pdaemon->left%60); num3 = num3.rightJustify(2, '0'); - tmp = i18n("%1:%2 hours left").arg(pdaemon->left/60).arg(num3); + tmp = i18n("%1:%2 hours left").tqarg(pdaemon->left/60).tqarg(num3); } else { // no remaining time available - tmp = i18n("%1% charged").arg(pdaemon->val); + tmp = i18n("%1% charged").tqarg(pdaemon->val); } } else { tmp = i18n("No Battery"); @@ -402,7 +402,7 @@ void laptop_dock::mousePressEvent( TQMouseEvent *event ) TQString speed = laptop_portable::cpu_frequency(); if (!speed.isEmpty()) { popup->insertSeparator(); - popup->insertItem(i18n("CPU: %1").arg(speed)); + popup->insertItem(i18n("CPU: %1").tqarg(speed)); } } @@ -449,7 +449,7 @@ void laptop_dock::mousePressEvent( TQMouseEvent *event ) // add a few bits of information thisSub->insertSeparator(); - thisSub->insertItem(slotname.arg(thiscard->num()+1)); + thisSub->insertItem(slotname.tqarg(thiscard->num()+1)); if (thiscard->status() & CARD_STATUS_READY) thisSub->insertItem(i18n("Ready")); if (thiscard->status() & CARD_STATUS_BUSY) @@ -641,10 +641,10 @@ quit: num3.setNum(pdaemon->left%60); num3 = num3.rightJustify(2, '0'); tmp = i18n("Plugged in - %1% charged (%2:%3 hours left)") - .arg(pdaemon->val).arg(pdaemon->left/60).arg(num3); + .tqarg(pdaemon->val).tqarg(pdaemon->left/60).tqarg(num3); } else { // no remaining time available - tmp = i18n("Plugged in - %1% charged").arg(pdaemon->val); + tmp = i18n("Plugged in - %1% charged").tqarg(pdaemon->val); } } else { tmp = i18n("Plugged in - no battery"); @@ -658,9 +658,9 @@ quit: num3.setNum(pdaemon->left%60); num3 = num3.rightJustify(2, '0'); tmp = i18n("Running on batteries - %1% charged (%2:%3 hours left)") - .arg(pdaemon->val).arg(pdaemon->left/60).arg(num3); + .tqarg(pdaemon->val).tqarg(pdaemon->left/60).tqarg(num3); } else { - tmp = i18n("Running on batteries - %1% charged").arg(pdaemon->val); + tmp = i18n("Running on batteries - %1% charged").tqarg(pdaemon->val); } } else { // running without any power source... diff --git a/klaptopdaemon/kpcmcia.cpp b/klaptopdaemon/kpcmcia.cpp index 50d7b4c..83e4971 100644 --- a/klaptopdaemon/kpcmcia.cpp +++ b/klaptopdaemon/kpcmcia.cpp @@ -175,7 +175,7 @@ tv.tv_sec = 0; tv.tv_usec = 0; TQTextStream ts(&f); bool foundit = false; TQString _thisreg = "^Socket %1: "; - TQRegExp thisreg ( _thisreg.arg(_num) ); + TQRegExp thisreg ( _thisreg.tqarg(_num) ); if (flock(f.handle(), LOCK_SH)) return updated; @@ -500,7 +500,7 @@ TQFile df("/proc/devices"); TQString thisreg; thisreg = "^[0-9]+ %1$"; - thisreg = thisreg.arg(x); + thisreg = thisreg.tqarg(x); if (df.open(IO_ReadOnly)) { TQTextStream t(&df); @@ -523,7 +523,7 @@ static int openDevice(dev_t dev) { TQString tmp_path = locateLocal("tmp", KGlobal::instance()->instanceName()); TQString ext = "_socket%1"; - tmp_path += ext.arg((int)dev); + tmp_path += ext.tqarg((int)dev); int rc = mknod(tmp_path.latin1(), (S_IFCHR | S_IREAD), dev); if (rc < 0) return -1; diff --git a/klaptopdaemon/kpcmciainfo.cpp b/klaptopdaemon/kpcmciainfo.cpp index dd80801..3a9b67a 100644 --- a/klaptopdaemon/kpcmciainfo.cpp +++ b/klaptopdaemon/kpcmciainfo.cpp @@ -22,7 +22,7 @@ #include <tqtabwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <kstatusbar.h> #include <klocale.h> @@ -57,14 +57,14 @@ KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name) prepareCards(); - _mainTab->resize(KDialog::sizeHint()); - resize(KDialog::sizeHint()); + _mainTab->resize(KDialog::tqsizeHint()); + resize(KDialog::tqsizeHint()); 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::sizeHint()); + _sb->resize(KDialog::tqsizeHint()); _mainGrid->addMultiCellWidget(_sb, 8, 8, 0, 4); _mainGrid->setRowStretch(8, 0); @@ -91,7 +91,7 @@ void KPCMCIAInfo::showTab(int num) { } -void KPCMCIAInfo::slotResetStatus() { +void KPCMCIAInfo::slotResettqStatus() { _sb->changeItem(i18n("Ready."), 0); } @@ -99,12 +99,12 @@ void KPCMCIAInfo::slotResetStatus() { void KPCMCIAInfo::statusNotice(const TQString& text, int life) { _sb->changeItem(text, 0); if (life > 0) - TQTimer::singleShot(life, this, TQT_SLOT(slotResetStatus())); + TQTimer::singleShot(life, this, TQT_SLOT(slotResettqStatus())); } -void KPCMCIAInfo::slotTabSetStatus(const TQString& text) { +void KPCMCIAInfo::slotTabSettqStatus(const TQString& text) { statusNotice(text); } @@ -134,9 +134,9 @@ 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(slotTabSetStatus(const TQString&))); - tp->resize(_mainTab->sizeHint()); - _mainTab->addTab(tp, tabname.arg(i+1)); + connect(tp, TQT_SIGNAL(setStatusBar(const TQString&)), this, TQT_SLOT(slotTabSettqStatus(const TQString&))); + tp->resize(_mainTab->tqsizeHint()); + _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->sizeHint()); + _card_name->resize(_card_name->tqsizeHint()); tmp = i18n("Card type: %1 "); - _card_type->setText(tmp.arg(_card->type())); - _card_type->resize(_card_type->sizeHint()); + _card_type->setText(tmp.tqarg(_card->type())); + _card_type->resize(_card_type->tqsizeHint()); tmp = i18n("Driver: %1"); - _card_driver->setText(tmp.arg(_card->driver())); - _card_driver->resize(_card_driver->sizeHint()); + _card_driver->setText(tmp.tqarg(_card->driver())); + _card_driver->resize(_card_driver->tqsizeHint()); tmp = i18n("IRQ: %1%2"); TQString tmp2; switch (_card->intType()) { @@ -256,33 +256,33 @@ void KPCMCIAInfoPage::update() { tmp2 = ""; }; if (_card->irq() <= 0) - _card_irq->setText(tmp.arg(i18n("none")).arg("")); - else _card_irq->setText(tmp.arg(_card->irq()).arg(tmp2)); - _card_irq->resize(_card_irq->sizeHint()); + _card_irq->setText(tmp.tqarg(i18n("none")).tqarg("")); + else _card_irq->setText(tmp.tqarg(_card->irq()).tqarg(tmp2)); + _card_irq->resize(_card_irq->tqsizeHint()); tmp = i18n("I/O port(s): %1"); if (_card->ports().isEmpty()) - _card_io->setText(tmp.arg(i18n("none"))); - else _card_io->setText(tmp.arg(_card->ports())); - _card_io->resize(_card_io->sizeHint()); + _card_io->setText(tmp.tqarg(i18n("none"))); + else _card_io->setText(tmp.tqarg(_card->ports())); + _card_io->resize(_card_io->tqsizeHint()); tmp = i18n("Bus: %1 bit %2"); if (_card->busWidth() == 0) _card_bus->setText(i18n("Bus: unknown")); - else _card_bus->setText(tmp.arg(_card->busWidth()).arg(_card->busWidth() == 16 ? i18n("PC Card") : i18n("Cardbus"))); - _card_bus->resize(_card_bus->sizeHint()); + else _card_bus->setText(tmp.tqarg(_card->busWidth()).tqarg(_card->busWidth() == 16 ? i18n("PC Card") : i18n("Cardbus"))); + _card_bus->resize(_card_bus->tqsizeHint()); tmp = i18n("Device: %1"); - _card_dev->setText(tmp.arg(_card->device())); - _card_dev->resize(_card_dev->sizeHint()); + _card_dev->setText(tmp.tqarg(_card->device())); + _card_dev->resize(_card_dev->tqsizeHint()); tmp = i18n("Power: +%1V"); - _card_vcc->setText(tmp.arg(_card->vcc()/10)); - _card_vcc->resize(_card_vcc->sizeHint()); + _card_vcc->setText(tmp.tqarg(_card->vcc()/10)); + _card_vcc->resize(_card_vcc->tqsizeHint()); tmp = i18n("Programming power: +%1V, +%2V"); - _card_vpp->setText(tmp.arg(_card->vpp()/10).arg(_card->vpp2()/10)); - _card_vpp->resize(_card_vpp->sizeHint()); + _card_vpp->setText(tmp.tqarg(_card->vpp()/10).tqarg(_card->vpp2()/10)); + _card_vpp->resize(_card_vpp->tqsizeHint()); tmp = i18n("Configuration base: 0x%1"); if (_card->configBase() == 0) _card_cfgbase->setText(i18n("Configuration base: none")); - else _card_cfgbase->setText(tmp.arg(_card->configBase(), -1, 16)); - _card_cfgbase->resize(_card_cfgbase->sizeHint()); + else _card_cfgbase->setText(tmp.tqarg(_card->configBase(), -1, 16)); + _card_cfgbase->resize(_card_cfgbase->tqsizeHint()); 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 458219b..20bc16e 100644 --- a/klaptopdaemon/kpcmciainfo.h +++ b/klaptopdaemon/kpcmciainfo.h @@ -52,8 +52,8 @@ public slots: void slotClose(); void update(); void updateCard(int num); - void slotResetStatus(); - void slotTabSetStatus(const TQString& text); + void slotResettqStatus(); + void slotTabSettqStatus(const TQString& text); signals: void updateNow(); diff --git a/klaptopdaemon/krichtextlabel.cpp b/klaptopdaemon/krichtextlabel.cpp index dd9268b..3d9dfcd 100644 --- a/klaptopdaemon/krichtextlabel.cpp +++ b/klaptopdaemon/krichtextlabel.cpp @@ -19,7 +19,7 @@ #include "krichtextlabel.h" #include <tqtooltip.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <tqsimplerichtext.h> #include <kglobalsettings.h> @@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text ) KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); - setAlignment( TQt::WordBreak ); + tqsetAlignment( TQt::WordBreak ); setText(text); } KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); - setAlignment( TQt::WordBreak ); + tqsetAlignment( TQt::WordBreak ); } void KRichTextLabel::setDefaultWidth(int defaultWidth) @@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); } -TQSize KRichTextLabel::minimumSizeHint() const +TQSize KRichTextLabel::tqminimumSizeHint() const { TQString qt_text = qrichtextify( text() ); int pref_width = 0; @@ -97,9 +97,9 @@ TQSize KRichTextLabel::minimumSizeHint() const return TQSize(pref_width, rt.height()); } -TQSize KRichTextLabel::sizeHint() const +TQSize KRichTextLabel::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } void KRichTextLabel::setText( const TQString &text ) { diff --git a/klaptopdaemon/krichtextlabel.h b/klaptopdaemon/krichtextlabel.h index 513e128..53a60ce 100644 --- a/klaptopdaemon/krichtextlabel.h +++ b/klaptopdaemon/krichtextlabel.h @@ -24,7 +24,7 @@ #include <tdelibs_export.h> /** - * @short A replacement for TQLabel that supports richtext and proper layout management + * @short A replacement for TQLabel that supports richtext and proper tqlayout management * * @author Waldo Bastian <bastian@kde.org> */ @@ -46,8 +46,8 @@ public: int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); - virtual TQSize minimumSizeHint() const; - virtual TQSize sizeHint() const; + virtual TQSize tqminimumSizeHint() const; + virtual TQSize tqsizeHint() const; TQSizePolicy sizePolicy() const; public slots: diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp index 5b710c5..36faefa 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.serverStatus() == 0) ? true : false; + //hasAudio = (audioServer.servertqStatus() == 0) ? true : false; // FIXME: make these configurable. Some system definitely don't // use /var/run/stab @@ -537,13 +537,13 @@ void laptop_daemon::haveBatteryLow(int t, const int num, const int type) if (type) { if (s.time_based_action_critical) { KPassivePopup::message(i18n("Battery power is running out."), - i18n("%1 % charge left.").arg(num), + i18n("%1 % charge left.").tqarg(num), BarIcon("laptop_battery"), dock_widget, 0, 20000); } else { // Will this ever be reached? KPassivePopup::message(i18n("Battery power is running out."), - i18n("%1 % charge left.").arg(num), + i18n("%1 % charge left.").tqarg(num), BarIcon("laptop_battery"), dock_widget, 0, 20000); } diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp index 4bea263..535e391 100644 --- a/klaptopdaemon/main.cpp +++ b/klaptopdaemon/main.cpp @@ -26,7 +26,7 @@ #include <kprocess.h> #include <kconfig.h> #include <kglobal.h> -#include <layout.h> +#include <tqlayout.h> #include <unistd.h> #include <fcntl.h> @@ -147,9 +147,9 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *) enablehibernate = config.readBoolEntry("EnableHibernate", false); laptop_portable::software_suspend_set_mask(enablehibernate); } - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); tab = new TQTabWidget(this); - layout->addWidget(tab); + tqlayout->addWidget(tab); battery = new BatteryConfig(parent, "kcmlaptop"); tab->addTab(battery, i18n("&Battery")); diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp index b6768b4..a2f4ba8 100644 --- a/klaptopdaemon/pcmcia.cpp +++ b/klaptopdaemon/pcmcia.cpp @@ -27,7 +27,7 @@ #include <stdlib.h> #include <tqfileinfo.h> -#include <layout.h> +#include <tqlayout.h> #include <kglobal.h> #include <klocale.h> @@ -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->sizeHint()); + vers->setMinimumSize(vers->tqsizeHint()); v1->addWidget(vers, 0); top_layout->activate(); diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp index 18c64fc..dbcb57c 100644 --- a/klaptopdaemon/portable.cpp +++ b/klaptopdaemon/portable.cpp @@ -87,7 +87,7 @@ #include <tqobject.h> #include <tqregexp.h> #include <tqiodevice.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvgroupbox.h> #include <tqvaluevector.h> @@ -199,7 +199,7 @@ pmu_read(apm_info *ap) int timerem = 0; int maxcharge = 0; for (int i = 0; i < bcnt; i++) { - TQFile bf(TQString("/proc/pmu/battery_%1").arg(i)); + TQFile bf(TQString("/proc/pmu/battery_%1").tqarg(i)); if (!bf.exists() || !bf.open(IO_ReadOnly)) continue; @@ -1226,7 +1226,7 @@ laptop_portable::get_battery_status(int &num_batteries, TQStringList &names, TQS for(unsigned int i = 0; i < acpi_batteries.count(); ++i) { acpi_battery_info& bat = acpi_batteries[i]; names.append(bat.name); - values.append(TQString("%1").arg(bat.percentage)); + values.append(TQString("%1").tqarg(bat.percentage)); state.append(bat.present ? "yes" : "no"); } return; @@ -1330,11 +1330,11 @@ TQString laptop_portable::cpu_frequency() { continue; if (ll.first().stripWhiteSpace() == "cpu MHz") { - rc = i18n("%1 MHz (%2)").arg(ll.last().stripWhiteSpace()).arg(rc); + rc = i18n("%1 MHz (%2)").tqarg(ll.last().stripWhiteSpace()).tqarg(rc); break; } else if (ll.first().stripWhiteSpace() == "clock") { - rc = TQString("%1 (%2)").arg(ll.last().stripWhiteSpace()).arg(rc); + rc = TQString("%1 (%2)").tqarg(ll.last().stripWhiteSpace()).tqarg(rc); break; } } @@ -1581,7 +1581,7 @@ get_acpi_list(char p, int *map, const char *dev, TQStringList &list, int &index, TQString l; f.readLine(l, 500); if (l.contains("active limit", false)) { - TQRegExp rx(TQString("%1(\\d+)").arg(p)); + TQRegExp rx(TQString("%1(\\d+)").tqarg(p)); if (rx.search(l) >= 0) { bool ok; int min = rx.cap(1).toInt(&ok); @@ -1706,7 +1706,7 @@ static int get_cpufreq_24_state(TQStringList &states, int ¤t, const TQStri f.close(); cpufreq_minmax_frequency[i] = buffer; unsigned int val = buffer.toUInt() / 1000; - states.append(i18n("%1 MHz").arg(val)); + states.append(i18n("%1 MHz").tqarg(val)); if(buffer.stripWhiteSpace() == cur) current = i; } @@ -2267,7 +2267,7 @@ laptop_portable::apm_set_mask(bool , bool ) // adds extra widgets to the battery panel // void -laptop_portable::extra_config(TQWidget * /*parent*/, KConfig * /*config*/, TQVBoxLayout * /*layout*/) +laptop_portable::extra_config(TQWidget * /*parent*/, KConfig * /*config*/, TQVBoxLayout * /*tqlayout*/) { // INSERT HERE } @@ -2945,7 +2945,7 @@ int laptop_portable::has_apm(int) // adds extra widgets to the battery panel // void -laptop_portable::extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *layout) +laptop_portable::extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *tqlayout) { // INSERT HERE } diff --git a/klaptopdaemon/portable.h b/klaptopdaemon/portable.h index a9fa703..b4843e1 100644 --- a/klaptopdaemon/portable.h +++ b/klaptopdaemon/portable.h @@ -98,7 +98,7 @@ public: static void get_battery_status(int &num_batteries, TQStringList &names, TQStringList &state, TQStringList &values); // get multiple battery status static bool has_lav(); // true if the following returns a valid value static float get_load_average(); // current short term load average - static void extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *layout); + static void extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *tqlayout); static void acpi_set_mask(bool standby, bool suspend, bool hibernate, bool perf, bool throttle); static void apm_set_mask(bool standby, bool suspend); static void software_suspend_set_mask(bool hibernate); diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp index a437156..fce096e 100644 --- a/klaptopdaemon/power.cpp +++ b/klaptopdaemon/power.cpp @@ -35,7 +35,7 @@ #include <kcombobox.h> #include <knuminput.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvbuttongroup.h> #include <tqspinbox.h> #include <tqradiobutton.h> @@ -122,7 +122,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) nopowerBox = new TQVButtonGroup(i18n("Not Powered"), this); TQToolTip::add( nopowerBox, i18n( "Options in this box apply when the laptop is unplugged from the wall and has been idle for a while" ) ); - nopowerBox->layout()->setSpacing( KDialog::spacingHint() ); + nopowerBox->tqlayout()->setSpacing( KDialog::spacingHint() ); hlay->addWidget( nopowerBox ); if (can_standby) { @@ -214,7 +214,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) powerBox = new TQVButtonGroup(i18n("Powered"), this); - powerBox->layout()->setSpacing( KDialog::spacingHint() ); + powerBox->tqlayout()->setSpacing( KDialog::spacingHint() ); TQToolTip::add( powerBox, i18n( "Options in this box apply when the laptop is plugged into the wall and has been idle for a while" ) ); hlay->addWidget( powerBox ); @@ -305,19 +305,19 @@ 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->setAlignment( TQt::WordBreak ); + explain->tqsetAlignment( 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->setAlignment( TQt::WordBreak ); + explain3->tqsetAlignment( TQt::WordBreak ); top_layout->addWidget(explain3, 0, TQt::AlignLeft); } top_layout->addStretch(1); - top_layout->addWidget( new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this ), 0, TQt::AlignRight ); + top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this ), 0, TQt::AlignRight ); } } diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp index ef6fa8e..b16ad1a 100644 --- a/klaptopdaemon/profile.cpp +++ b/klaptopdaemon/profile.cpp @@ -41,7 +41,7 @@ #include <kcombobox.h> // other TQt headers: -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqhbox.h> @@ -205,15 +205,15 @@ 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->setAlignment( TQt::WordBreak ); + tmp_label->tqsetAlignment( 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->setAlignment( TQt::WordBreak ); + tmp_label->tqsetAlignment( TQt::WordBreak ); top_layout->addWidget( tmp_label ); top_layout->addStretch(1); - top_layout->addWidget( new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this), 0, TQt::AlignRight ); + top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this), 0, TQt::AlignRight ); load(); diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp index fdf288c..689b9d0 100644 --- a/klaptopdaemon/sony.cpp +++ b/klaptopdaemon/sony.cpp @@ -43,7 +43,7 @@ #include <krichtextlabel.h> // other TQt headers: -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqhbox.h> @@ -99,7 +99,7 @@ SonyConfig::SonyConfig(TQWidget * parent, const char *name) top_layout->addStretch(1); - top_layout->addWidget( new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this), 0, TQt::AlignRight ); + top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this), 0, TQt::AlignRight ); load(); diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp index 2121337..84d8501 100644 --- a/klaptopdaemon/warning.cpp +++ b/klaptopdaemon/warning.cpp @@ -33,7 +33,7 @@ #include <kapplication.h> #include <kcombobox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqspinbox.h> #include <tqslider.h> @@ -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->sizeHint()); + checkBrightness->setMinimumSize(checkBrightness->tqsizeHint()); 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))); @@ -236,23 +236,23 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) TQVButtonGroup *b = new TQVButtonGroup(i18n("System State Change"), this); TQToolTip::add( b, i18n( "You may choose one of the following to occur when the battery gets low" ) ); - b->layout()->setSpacing( KDialog::spacingHint() ); + b->tqlayout()->setSpacing( KDialog::spacingHint() ); 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->sizeHint()); + checkStandby->setMinimumSize(checkStandby->tqsizeHint()); 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->sizeHint()); + checkSuspend->setMinimumSize(checkSuspend->tqsizeHint()); 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->sizeHint()); + checkHibernate->setMinimumSize(checkHibernate->tqsizeHint()); 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->setAlignment( TQt::WordBreak ); + explain->tqsetAlignment( TQt::WordBreak ); grid->addMultiCellWidget(explain, curRow, curRow, 0, 1); ++curRow; @@ -288,7 +288,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) } grid->setRowStretch(curRow++, 1); - grid->addWidget(new TQLabel( i18n("Version: %1").arg(LAPTOP_VERSION), this), + grid->addWidget(new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this), curRow, 1, TQt::AlignRight); } diff --git a/klaptopdaemon/xautolock.cc b/klaptopdaemon/xautolock.cc index 630b175..25b2242 100644 --- a/klaptopdaemon/xautolock.cc +++ b/klaptopdaemon/xautolock.cc @@ -32,7 +32,7 @@ extern "C" { #include <X11/extensions/dpms.h> #ifndef HAVE_DPMSINFO_PROTO -Status DPMSInfo ( Display *, CARD16 *, BOOL * ); +tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * ); #endif } #endif diff --git a/klaptopdaemon/xautolock_diy.c b/klaptopdaemon/xautolock_diy.c index b9df2f8..c816ae9 100644 --- a/klaptopdaemon/xautolock_diy.c +++ b/klaptopdaemon/xautolock_diy.c @@ -96,8 +96,8 @@ selectEvents (Window window, Bool substructureOnly) { Window root; /* root window of the window */ Window parent; /* parent of the window */ - Window* children; /* children of the window */ - unsigned nofChildren = 0; /* number of children */ + Window* tqchildren; /* tqchildren of the window */ + unsigned nofChildren = 0; /* number of tqchildren */ unsigned i; /* loop counter */ XWindowAttributes attribs; /* attributes of the window */ @@ -107,12 +107,12 @@ selectEvents (Window window, Bool substructureOnly) * Start by querying the server about the root and parent windows. */ if (!XQueryTree (queue.display, window, &root, &parent, - &children, &nofChildren)) + &tqchildren, &nofChildren)) { return; } - if (nofChildren) (void) XFree ((char*) children); + if (nofChildren) (void) XFree ((char*) tqchildren); /* * Build the appropriate event mask. The basic idea is that we don't @@ -168,7 +168,7 @@ selectEvents (Window window, Bool substructureOnly) } /* - * Now ask for the list of children again, since it might have changed + * Now ask for the list of tqchildren again, since it might have changed * in between the last time and us selecting SubstructureNotifyMask. * * There is a (very small) chance that we might process a subtree twice: @@ -179,20 +179,20 @@ selectEvents (Window window, Bool substructureOnly) * isn't required... */ if (!XQueryTree (queue.display, window, &root, &parent, - &children, &nofChildren)) + &tqchildren, &nofChildren)) { return; } /* - * Now do the same thing for all children. + * Now do the same thing for all tqchildren. */ for (i = 0; i < nofChildren; ++i) { - selectEvents (children[i], substructureOnly); + selectEvents (tqchildren[i], substructureOnly); } - if (nofChildren) (void) XFree ((char*) children); + if (nofChildren) (void) XFree ((char*) tqchildren); } #if 0 diff --git a/klaptopdaemon/xautolock_engine.c b/klaptopdaemon/xautolock_engine.c index 62f968a..bbce54e 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 (vmsStatus == 0) + if (vmstqStatus == 0) { #else /* VMS */ if (lockerPid) @@ -336,7 +336,7 @@ evaluateTriggers (Display* d) || now >= lockTrigger) { #ifdef VMS - if (vmsStatus != 0) + if (vmstqStatus != 0) #else /* VMS */ if (!lockerPid) #endif /* VMS */ @@ -350,9 +350,9 @@ evaluateTriggers (Display* d) case 0: (void) close (ConnectionNumber (d)); #ifdef VMS - vmsStatus = 0; + vmstqStatus = 0; lockerPid = lib$spawn ((lockNow ? &nowLockerDescr : &lockerDescr), - 0, 0, &1, 0, 0, &vmsStatus); + 0, 0, &1, 0, 0, &vmstqStatus); if (!(lockerPid & 1)) exit (lockerPid); diff --git a/kmilo/asus/asus.cpp b/kmilo/asus/asus.cpp index 1af8780..a83235d 100644 --- a/kmilo/asus/asus.cpp +++ b/kmilo/asus/asus.cpp @@ -183,7 +183,7 @@ bool AsusMonitor::readProc(asus_state_struct* asus_state) int AsusMonitor::readProcEntry(const TQString &name) { - TQFile f(TQString("/proc/acpi/asus/%1").arg(name).local8Bit()); + TQFile f(TQString("/proc/acpi/asus/%1").tqarg(name).local8Bit()); if (f.open(IO_ReadOnly)) { diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui index 27778ef..c9ad68b 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui +++ b/kmilo/kmilo_kvaio/kcmkvaio/kcmkvaio_general.ui @@ -71,7 +71,7 @@ <property name="text"> <string>Remaining battery capacity:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -109,7 +109,7 @@ <property name="text"> <string>AC</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -150,7 +150,7 @@ <property name="text"> <string>Bat 1</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -186,7 +186,7 @@ <property name="text"> <string>Bat 2</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index 52a5e68..0624c1e 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -20,7 +20,7 @@ */ #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqtimer.h> #include <tqslider.h> @@ -61,10 +61,10 @@ KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList "mirko@kde.org"); setAboutData( about ); - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); mKVaioGeneral = new KCMKVaioGeneral(this); - layout->addWidget( mKVaioGeneral ); - layout->addStretch(); + tqlayout->addWidget( mKVaioGeneral ); + tqlayout->addStretch(); mDriver = new KVaioDriverInterface(TQT_TQOBJECT(this)); mDriverAvailable = mDriver->connectToDriver(false); @@ -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->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max, + if(mDriver->getBatterytqStatus(bat1Avail, bat1Remaining, bat1Max, bat2Avail, bat2Remaining, bat2Max, acConnected) ) { diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index 437d188..3f52ae9 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) { - showBatteryStatus (true); + showBatterytqStatus (true); } break; default: @@ -306,7 +306,7 @@ void KVaio::loadConfiguration(KConfig *k) mReportUnknownEvents = k->readBoolEntry("Report_Unknown_Events", false); - mReportPowerStatus = + mReportPowertqStatus = k->readBoolEntry("PeriodicallyReportPowerStatus", false); mShowPowerStatusOnBackButton = k->readBoolEntry("PowerStatusOnBackButton", true); @@ -315,7 +315,7 @@ void KVaio::loadConfiguration(KConfig *k) << " mReportUnknownEvents: " << mReportUnknownEvents << endl << " mReportPowerStatus: " - << mReportPowerStatus << endl + << mReportPowertqStatus << endl << "mShowPowerStatusOnBackButton: " << mShowPowerStatusOnBackButton << endl; } @@ -327,31 +327,31 @@ const KVaioDriverInterface* KVaio::driver() void KVaio::slotTimeout () { - showBatteryStatus (); + showBatterytqStatus (); mTimer->start (4000, true); } -bool KVaio::showBatteryStatus ( bool force ) +bool KVaio::showBatterytqStatus ( 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 displayACStatus = false; + bool displayACtqStatus = false; TQString text, acMsg; TQTextStream stream(text, IO_WriteOnly); // ----- - // only display on startup if mReportPowerStatus is true: - if (mReportPowerStatus==false || !force) + // only display on startup if mReportPowertqStatus is true: + if (mReportPowertqStatus==false || !force) { return true; } // query all necessary information: - (void) mDriver->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max, + (void) mDriver->getBatterytqStatus(bat1Avail, bat1Remaining, bat1Max, bat2Avail, bat2Remaining, bat2Max, acConnected); @@ -364,7 +364,7 @@ bool KVaio::showBatteryStatus ( bool force ) if (acConnectedCache != acConnected || force) { - displayACStatus = true; + displayACtqStatus = true; acConnectedCache = acConnected; } @@ -379,10 +379,10 @@ bool KVaio::showBatteryStatus ( bool force ) } // ----- prepare text messages - if (displayACStatus || displayBatteryMsg) + if (displayACtqStatus || displayBatteryMsg) { - if (displayACStatus) + if (displayACtqStatus) { acMsg = acConnected ? i18n ("AC Connected") : i18n ("AC Disconnected"); } @@ -397,7 +397,7 @@ bool KVaio::showBatteryStatus ( bool force ) case 3: case 2: case 1: - stream << i18n("Caution: Battery is Almost Empty (%1% remaining).").arg(remaining); + stream << i18n("Caution: Battery is Almost Empty (%1% remaining).").tqarg(remaining); break; case 0: stream << i18n("Alert: Battery is Empty!"); @@ -406,11 +406,11 @@ bool KVaio::showBatteryStatus ( bool force ) stream << i18n("No Battery Inserted."); break; default: - stream << i18n("Remaining Battery Capacity: %1%").arg( remaining ); + stream << i18n("Remaining Battery Capacity: %1%").tqarg( remaining ); }; // show a message if the battery status changed by more then 10% or on startup - if (displayACStatus) + if (displayACtqStatus) { stream << endl << acMsg; } diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h index ba2bf98..c012c66 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 showBatteryStatus ( bool force = false); + bool showBatterytqStatus ( bool force = false); protected slots: void slotVaioEvent(int); void slotTimeout(); @@ -106,7 +106,7 @@ private: int m_BrightnessStep; bool mReportUnknownEvents; - bool mReportPowerStatus; + bool mReportPowertqStatus; bool mShowPowerStatusOnBackButton; TQTimer *mTimer; }; diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp index 088ae51..3aa8e4f 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp @@ -162,7 +162,7 @@ void KVaioDriverInterface::setBrightness(int value) } } -bool KVaioDriverInterface::getBatteryStatus( +bool KVaioDriverInterface::getBatterytqStatus( 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 2d051c2..2cf7fee 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 getBatteryStatus(bool& bat1Avail, int& bat1Remaining, int& bat1Max, + bool getBatterytqStatus(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 6bc35c7..7271ea3 100644 --- a/kmilo/kmilod/defaultskin.cpp +++ b/kmilo/kmilod/defaultskin.cpp @@ -100,10 +100,10 @@ void DefaultSkin::show() { #if KDE_IS_VERSION(3,1,90) TQRect r = KGlobalSettings::splashScreenDesktopGeometry(); #else - TQRect r = TQApplication::desktop()->geometry(); + TQRect r = TQApplication::desktop()->tqgeometry(); #endif - // _label->resize(_label->minimumSizeHint()); - // _widget->resize(_label->minimumSizeHint()); + // _label->resize(_label->tqminimumSizeHint()); + // _widget->resize(_label->tqminimumSizeHint()); _widget->move(r.center() - TQPoint(_widget->width()/2, _widget->height()/2)); _widget->show(); diff --git a/kmilo/kmilod/defaultwidget.ui b/kmilo/kmilod/defaultwidget.ui index 77bc3f3..c987ed3 100644 --- a/kmilo/kmilod/defaultwidget.ui +++ b/kmilo/kmilod/defaultwidget.ui @@ -33,7 +33,7 @@ Released under the terms of the GNU GPL.</comment> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -57,7 +57,7 @@ Released under the terms of the GNU GPL.</comment> <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kmilo/powerbook2/pb_monitor.cpp b/kmilo/powerbook2/pb_monitor.cpp index 313a32d..cf3b927 100644 --- a/kmilo/powerbook2/pb_monitor.cpp +++ b/kmilo/powerbook2/pb_monitor.cpp @@ -98,7 +98,7 @@ Monitor::DisplayType PowerBookMonitor::poll() { rc = Monitor::Tap; TQString marg = tpmodes[ tag->data & 3 ]; - m_message = i18n( "Operating mode set to: %1." ).arg( marg ); + m_message = i18n( "Operating mode set to: %1." ).tqarg( marg ); } break; default: diff --git a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui index 5fb8d90..47d3874 100644 --- a/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui +++ b/kmilo/thinkpad/kcmthinkpad/kcmthinkpad_general.ui @@ -62,7 +62,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout27</cstring> + <cstring>tqlayout27</cstring> </property> <grid> <property name="name"> diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp index 31a9417..7ad2b08 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.cpp +++ b/kmilo/thinkpad/kcmthinkpad/main.cpp @@ -23,7 +23,7 @@ */ #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqspinbox.h> #include <tqfile.h> @@ -68,10 +68,10 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T "jr@jriddell.org"); setAboutData( about ); - TQVBoxLayout* layout = new TQVBoxLayout(this); + TQVBoxLayout* tqlayout = new TQVBoxLayout(this); m_KCMThinkpadGeneral = new KCMThinkpadGeneral(this); - layout->addWidget( m_KCMThinkpadGeneral ); - layout->addStretch(); + tqlayout->addWidget( m_KCMThinkpadGeneral ); + tqlayout->addStretch(); load(); @@ -116,7 +116,7 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T "R30/R31 models and to use a custom volume " "change step, set the nvram device to world " "writeable: <em>chmod 666 " - "/dev/nvram</em>").arg(m_nvramFile)); + "/dev/nvram</em>").tqarg(m_nvramFile)); #endif } else { m_KCMThinkpadGeneral->tlOff->setText(i18n("Thinkpad Buttons KMilo Plugin Ready For Configuration")); diff --git a/kregexpeditor/Comments b/kregexpeditor/Comments index 71f4470..97cd98e 100644 --- a/kregexpeditor/Comments +++ b/kregexpeditor/Comments @@ -1,4 +1,4 @@ (1) If I do not resize the widget to be reparented then it will take up all the size of its new parent, and the parent will never receive a - repaint event, and will thus never get a chance to resize its new child + tqrepaint event, and will thus never get a chance to resize its new child to a proper size (This is namely done in repaintEvent() ). diff --git a/kregexpeditor/KMultiFormListBox/ccp.cpp b/kregexpeditor/KMultiFormListBox/ccp.cpp index be65d35..ff2d6c3 100644 --- a/kregexpeditor/KMultiFormListBox/ccp.cpp +++ b/kregexpeditor/KMultiFormListBox/ccp.cpp @@ -38,9 +38,9 @@ CCP::CCP(KMultiFormListBoxMultiVisible *ee_, KMultiFormListBoxEntry *eee_) : TQO void CCP::install(TQObject *elm) { elm->installEventFilter(this); - const TQObjectList children = elm->childrenListObject(); - if (!children.isEmpty()) { - TQObjectListIt it = TQObjectListIt(children); + const TQObjectList tqchildren = elm->childrenListObject(); + if (!tqchildren.isEmpty()) { + TQObjectListIt it = TQObjectListIt(tqchildren); while (TQObject *child=it.current()) { if (child->inherits("KMultiFormListBoxMultiVisible")) { diff --git a/kregexpeditor/KMultiFormListBox/indexWindow.cpp b/kregexpeditor/KMultiFormListBox/indexWindow.cpp index ccbd636..f81ea07 100644 --- a/kregexpeditor/KMultiFormListBox/indexWindow.cpp +++ b/kregexpeditor/KMultiFormListBox/indexWindow.cpp @@ -24,7 +24,7 @@ #include "indexWindow.h" #include <iostream> -#include <layout.h> +#include <tqlayout.h> indexWindow::indexWindow() : TQWidget(0,"", WStyle_Customize | WType_Popup) { @@ -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 sizeHint doesn't report the correct size + // I need to do it this way, as tqsizeHint 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 3dcab67..6e82e85 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->sizeHint().width()); + maxWidth = TQMAX(maxWidth, child->tqsizeHint().width()); if (strcmp(child->name(), "seperator") != 0) { - totalHeight += child->sizeHint().height(); + totalHeight += child->tqsizeHint().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->sizeHint().height(); + h = child2->tqsizeHint().height(); h += extra; } else { diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp index 8d3ffe3..905634c 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp @@ -150,7 +150,7 @@ void KMultiFormListBoxWindowed::slotDeleteEntry() WindowListboxItem *item = selected(); if (item) { int answer = - KMessageBox::warningContinueCancel(0, i18n("Delete item \"%1\"?").arg(item->text()),i18n("Delete Item"),KStdGuiItem::del()); + KMessageBox::warningContinueCancel(0, i18n("Delete item \"%1\"?").tqarg(item->text()),i18n("Delete Item"),KStdGuiItem::del()); if (answer == KMessageBox::Continue) { delete item; slotUpdateButtonState(); diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp index 58b82da..a455bae 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp @@ -40,9 +40,9 @@ KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiF TQWidget *widget = theWidget->qWidget(); - TQHBoxLayout *layout = new TQHBoxLayout( this ); + TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); _factory = factory; - layout->addWidget( widget ); + tqlayout->addWidget( widget ); } void KMultiFormListBox::append( KMultiFormListBoxEntry *element ) diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h index e432c59..ba9b8a8 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h @@ -22,7 +22,7 @@ #include "kmultiformlistbox-shower.h" #include "kmultiformlistboxentry.h" #include <tqptrlist.h> -#include <layout.h> +#include <tqlayout.h> #include <tqscrollview.h> #ifdef TQT_ONLY diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h index 90d4e35..b4bf36c 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::fromLatin1(""); } + virtual TQString idxString() { return TQString::tqfromLatin1(""); } public slots: void acceptIndexButton(); diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp index 9015aaa..42d411b 100644 --- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp +++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp @@ -48,11 +48,11 @@ void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stre if ( ! from->inherits(TQWIDGET_OBJECT_NAME_STRING) ) return; - // Serializing all the children (if any). - const TQObjectList children = from->childrenListObject(); - if ( !children.isEmpty() ) { - stream << children.count(); - for ( TQObjectListIt it = TQObjectListIt(children); *it; ++it ) { + // Serializing all the tqchildren (if any). + const TQObjectList tqchildren = from->childrenListObject(); + if ( !tqchildren.isEmpty() ) { + stream << tqchildren.count(); + for ( TQObjectListIt it = TQObjectListIt(tqchildren); *it; ++it ) { toStream( *it, stream ); } } @@ -83,14 +83,14 @@ void KWidgetStreamer::propertyFromStream( TQDataStream& stream, TQObject* to ) if ( ! to->inherits(TQWIDGET_OBJECT_NAME_STRING) ) return; - // Stream in all the children (if any) - const TQObjectList children = to->childrenListObject(); + // Stream in all the tqchildren (if any) + const TQObjectList tqchildren = to->childrenListObject(); unsigned int count; stream >> count; - if ( !children.isEmpty() ) { - Q_ASSERT( count == children.count() ); - for ( TQObjectListIt it = TQObjectListIt(children); *it; ++it ) + if ( !tqchildren.isEmpty() ) { + Q_ASSERT( count == tqchildren.count() ); + for ( TQObjectListIt it = TQObjectListIt(tqchildren); *it; ++it ) fromStream( stream, *it ); } else { @@ -117,61 +117,61 @@ KWidgetStreamer::KWidgetStreamer () // TQCheckBox l.clear(); - l << TQString::fromLatin1("enabled") - << TQString::fromLatin1("checked") << TQString::fromLatin1("tristate"); - _map.insert(TQString::fromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), l); + l << TQString::tqfromLatin1("enabled") + << TQString::tqfromLatin1("checked") << TQString::tqfromLatin1("tristate"); + _map.insert(TQString::tqfromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), l); // TQComboBox l.clear(); - 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); + 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); // TQDial l.clear(); - l << TQString::fromLatin1("enabled") - << TQString::fromLatin1("tracking") << TQString::fromLatin1("wrapping") - << TQString::fromLatin1("value"); - _map.insert(TQString::fromLatin1(TQDIAL_OBJECT_NAME_STRING), l); + l << TQString::tqfromLatin1("enabled") + << TQString::tqfromLatin1("tracking") << TQString::tqfromLatin1("wrapping") + << TQString::tqfromLatin1("value"); + _map.insert(TQString::tqfromLatin1(TQDIAL_OBJECT_NAME_STRING), l); // TQLCDNumber l.clear(); - 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); + 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); // TQLineEdit l.clear(); - l << TQString::fromLatin1("enabled") - << TQString::fromLatin1("text") << TQString::fromLatin1("maxLength") - << TQString::fromLatin1("echoMode") << TQString::fromLatin1("alignment"); - _map.insert(TQString::fromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), l); + 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); // TQMultiLineEdit l.clear(); - l << TQString::fromLatin1("enabled") - << TQString::fromLatin1("text") - << TQString::fromLatin1("alignment"); - _map.insert(TQString::fromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), l); + l << TQString::tqfromLatin1("enabled") + << TQString::tqfromLatin1("text") + << TQString::tqfromLatin1("tqalignment"); + _map.insert(TQString::tqfromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), l); // TQRadioButton l.clear(); - l << TQString::fromLatin1("enabled") - << TQString::fromLatin1("checked"); - _map.insert(TQString::fromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), l); + l << TQString::tqfromLatin1("enabled") + << TQString::tqfromLatin1("checked"); + _map.insert(TQString::tqfromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), l); // TQSlider l.clear(); - l << TQString::fromLatin1("enabled") - << TQString::fromLatin1("value"); - _map.insert(TQString::fromLatin1(TQSLIDER_OBJECT_NAME_STRING), l); + l << TQString::tqfromLatin1("enabled") + << TQString::tqfromLatin1("value"); + _map.insert(TQString::tqfromLatin1(TQSLIDER_OBJECT_NAME_STRING), l); // TQSpinBox l.clear(); - l << TQString::fromLatin1("enabled") - << TQString::fromLatin1("value"); - _map.insert(TQString::fromLatin1(TQSPINBOX_OBJECT_NAME_STRING), l); + l << TQString::tqfromLatin1("enabled") + << TQString::tqfromLatin1("value"); + _map.insert(TQString::tqfromLatin1(TQSPINBOX_OBJECT_NAME_STRING), l); } diff --git a/kregexpeditor/altnregexp.cpp b/kregexpeditor/altnregexp.cpp index ef8b8de..b9b01ec 100644 --- a/kregexpeditor/altnregexp.cpp +++ b/kregexpeditor/altnregexp.cpp @@ -29,7 +29,7 @@ void AltnRegExp::addRegExp( RegExp *elm ) addChild( elm ); } -RegExpList AltnRegExp::children() const +RegExpList AltnRegExp::tqchildren() const { return list; } diff --git a/kregexpeditor/altnregexp.h b/kregexpeditor/altnregexp.h index c126c5f..37614f1 100644 --- a/kregexpeditor/altnregexp.h +++ b/kregexpeditor/altnregexp.h @@ -30,7 +30,7 @@ public: AltnRegExp( bool selected ); void addRegExp( RegExp * ); - RegExpList children() const; + RegExpList tqchildren() const; virtual bool check( ErrorMap&, bool first, bool last ); virtual int precedence() const { return 1;} diff --git a/kregexpeditor/altnwidget.cpp b/kregexpeditor/altnwidget.cpp index 3a29135..25befe5 100644 --- a/kregexpeditor/altnwidget.cpp +++ b/kregexpeditor/altnwidget.cpp @@ -34,7 +34,7 @@ AltnWidget::AltnWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, { DragAccepter *accepter = new DragAccepter(editorWindow, this); accepter->resize(0,0); // See note (1) in Comments - _children.append(accepter); + _tqchildren.append(accepter); _text = i18n("Alternatives"); } @@ -44,10 +44,10 @@ AltnWidget::AltnWidget( AltnRegExp* regexp, RegExpEditorWindow* editorWindow, { DragAccepter *accepter = new DragAccepter(editorWindow, this); accepter->resize(0,0); // See note (1) in Comments - _children.append(accepter); + _tqchildren.append(accepter); _text = i18n("Alternatives"); - RegExpList list = regexp->children(); + RegExpList list = regexp->tqchildren(); for ( RegExpListIt it(list); *it; ++it ) { RegExpWidget* child = WidgetFactory::createWidget( *it, editorWindow, this ); ConcWidget* conc; @@ -65,12 +65,12 @@ void AltnWidget::addNewChild(DragAccepter *accepter, RegExpWidget *child) ConcWidget *conc = new ConcWidget(_editorWindow, child,this); MultiContainerWidget::addNewChild( accepter, conc ); updateDrawLineInfo(); - repaint(); + tqrepaint(); } void AltnWidget::setConcChild(ConcWidget *child) { - addNewConcChild( dynamic_cast<DragAccepter*>(_children.at(0)), child ); + addNewConcChild( dynamic_cast<DragAccepter*>(_tqchildren.at(0)), child ); } void AltnWidget::addNewConcChild(DragAccepter *accepter, ConcWidget *child) @@ -81,21 +81,21 @@ void AltnWidget::addNewConcChild(DragAccepter *accepter, ConcWidget *child) } -TQSize AltnWidget::sizeHint() const +TQSize AltnWidget::tqsizeHint() const { - TQPtrListIterator<RegExpWidget> it(_children); + TQPtrListIterator<RegExpWidget> it(_tqchildren); // Skip the first child, as we only need half of the size of the first and the // last drag accepter. Does, however, not apply when there only is onw child. - if ( _children.count() != 1 ) + if ( _tqchildren.count() != 1 ) ++it; - _childrenWidth = 0; - _childrenHeight = 0; + _tqchildrenWidth = 0; + _tqchildrenHeight = 0; for ( ; *it ; ++it) { - TQSize thisChildSize = (*it)->sizeHint(); - _childrenWidth = TQMAX(_childrenWidth, thisChildSize.width()); - _childrenHeight += thisChildSize.height(); + TQSize thisChildSize = (*it)->tqsizeHint(); + _tqchildrenWidth = TQMAX(_tqchildrenWidth, thisChildSize.width()); + _tqchildrenHeight += thisChildSize.height(); } // Now add the size of the header @@ -104,21 +104,21 @@ TQSize AltnWidget::sizeHint() const int headerWidth = _textSize.width() + 2 * bdSize + 2; - _childrenWidth = TQMAX(_childrenWidth, headerWidth); + _tqchildrenWidth = TQMAX(_tqchildrenWidth, headerWidth); - return TQSize(_childrenWidth + 2*pw, _childrenHeight + _textSize.height() + 1*pw ); + return TQSize(_tqchildrenWidth + 2*pw, _tqchildrenHeight + _textSize.height() + 1*pw ); } void AltnWidget::paintEvent( TQPaintEvent *e) { - Q_ASSERT( dynamic_cast<DragAccepter*>(_children.at(0)) ); + Q_ASSERT( dynamic_cast<DragAccepter*>(_tqchildren.at(0)) ); // if this fails, then I should check the location of the show() - Q_ASSERT( _children.count() == 1 || - ( _children.count() >=3 && - dynamic_cast<DragAccepter*>(_children.at(_children.count()-1)) ) ); + Q_ASSERT( _tqchildren.count() == 1 || + ( _tqchildren.count() >=3 && + dynamic_cast<DragAccepter*>(_tqchildren.at(_tqchildren.count()-1)) ) ); int offset = 0; - TQSize mySize = sizeHint(); + TQSize mySize = tqsizeHint(); TQPainter painter(this); drawPossibleSelection( painter, mySize ); @@ -136,27 +136,27 @@ void AltnWidget::paintEvent( TQPaintEvent *e) painter.drawLine(mySize.width()-pw, startY, mySize.width()-pw, mySize.height()); painter.drawLine(0,mySize.height()-pw, mySize.width()-pw, mySize.height()-pw); - //---- Run through all the children and place them at the correct location. + //---- Run through all the tqchildren and place them at the correct location. offset = _textSize.height(); xOffset = pw; - for (unsigned int i = 0; i < _children.count(); i++ ) { + for (unsigned int i = 0; i < _tqchildren.count(); i++ ) { - RegExpWidget* child = _children.at(i); + RegExpWidget* child = _tqchildren.at(i); - TQSize childSize = child->sizeHint(); + TQSize childSize = child->tqsizeHint(); TQSize curChildSize = child->size(); //-------------------------------------- place the child int x = xOffset; int y = offset; int h = childSize.height(); - if ( ( _children.count() != 1 ) && ( i == 0 || i == _children.count() -1 ) ) { + if ( ( _tqchildren.count() != 1 ) && ( i == 0 || i == _tqchildren.count() -1 ) ) { // first and last DragAccepter should only be half size. h /= 2; } - int w = _childrenWidth; + int w = _tqchildrenWidth; child->setGeometry( x, y, w, h ); if ( w != curChildSize.width() || h != curChildSize.height() ) { // I resized the child, so give it a chance to relect thus. @@ -172,7 +172,7 @@ RegExp* AltnWidget::regExp() const { AltnRegExp *regexp = new AltnRegExp( isSelected() ); - TQPtrListIterator<RegExpWidget> it(_children); + TQPtrListIterator<RegExpWidget> it(_tqchildren); ++it; // start with the second element for ( ; *it; it+=2 ) { regexp->addRegExp( (*it)->regExp() ); @@ -183,8 +183,8 @@ RegExp* AltnWidget::regExp() const void AltnWidget::applyRegExpToSelection( RegExpType type ) { - for ( unsigned int i=1; i < _children.count(); i += 2 ) { - RegExpWidget* child = _children.at( i ); + for ( unsigned int i=1; i < _tqchildren.count(); i += 2 ) { + RegExpWidget* child = _tqchildren.at( i ); if ( child->hasSelection() ) { child->applyRegExpToSelection( type ); } @@ -197,7 +197,7 @@ RegExp* AltnWidget::selection() const if ( isSelected() ) return regExp(); else { - TQPtrListIterator<RegExpWidget> it(_children); + TQPtrListIterator<RegExpWidget> it(_tqchildren); ++it; // Skip past DragAccepter for ( ; *it; it+=2 ) { if ( (*it)->hasSelection() ) { @@ -216,7 +216,7 @@ bool AltnWidget::validateSelection() const } bool foundASelection = false; - TQPtrListIterator<RegExpWidget> it(_children); + TQPtrListIterator<RegExpWidget> it(_tqchildren); ++it; // Skip past DragAccepter for ( ; *it; it+=2 ) { if ( (*it)->hasSelection() ) { @@ -238,9 +238,9 @@ bool AltnWidget::validateSelection() const void AltnWidget::updateDrawLineInfo() { - for ( unsigned int i=0; i < _children.count(); i+=2 ) { - bool line = ( i != 0 && i!= _children.count()-1 ); - DragAccepter *accepter = dynamic_cast<DragAccepter*>(_children.at(i)); + for ( unsigned int i=0; i < _tqchildren.count(); i+=2 ) { + bool line = ( i != 0 && i!= _tqchildren.count()-1 ); + DragAccepter *accepter = dynamic_cast<DragAccepter*>(_tqchildren.at(i)); if (accepter) accepter->setDrawLine( line ); } diff --git a/kregexpeditor/altnwidget.h b/kregexpeditor/altnwidget.h index 589726d..519eba5 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 sizeHint() const; + virtual TQSize tqsizeHint() const; virtual RegExp* regExp() const; virtual void applyRegExpToSelection( RegExpType type ); virtual RegExpType type() const { return ALTN; } @@ -58,8 +58,8 @@ private: mutable TQSize _textSize; mutable int _maxSelectedWidth; - mutable int _childrenWidth; - mutable int _childrenHeight; + mutable int _tqchildrenWidth; + mutable int _tqchildrenHeight; }; #endif // altnwidget diff --git a/kregexpeditor/auxbuttons.cpp b/kregexpeditor/auxbuttons.cpp index b56b49b..855f6d1 100644 --- a/kregexpeditor/auxbuttons.cpp +++ b/kregexpeditor/auxbuttons.cpp @@ -26,7 +26,7 @@ #endif #include "auxbuttons.h" -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include <tqtooltip.h> #include <tqtoolbutton.h> @@ -35,48 +35,48 @@ AuxButtons::AuxButtons( TQWidget* parent, const char* name = 0) :TQDockWindow( TQDockWindow::InDock, parent, name) { - TQBoxLayout* layout = boxLayout(); + TQBoxLayout* tqlayout = boxLayout(); _undo = new TQToolButton( this ); - _undo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("undo") ) ); - layout->addWidget( _undo ); + _undo->setIconSet( Util::getSystemIconSet(TQString::tqfromLatin1("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::fromLatin1("redo") ) ); - layout->addWidget( _redo ); + _redo->setIconSet( Util::getSystemIconSet(TQString::tqfromLatin1("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::fromLatin1("editcut") ) ); - layout->addWidget( _cut ); + _cut->setIconSet( Util::getSystemIconSet(TQString::tqfromLatin1("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::fromLatin1("editcopy") ) ); - layout->addWidget( _copy ); + _copy->setIconSet( Util::getSystemIconSet(TQString::tqfromLatin1("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::fromLatin1("editpaste")) ); - layout->addWidget( _paste ); + _paste->setIconSet( Util::getSystemIconSet(TQString::tqfromLatin1("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::fromLatin1("filesave")) ); - layout->addWidget( _save ); + _save->setIconSet( Util::getSystemIconSet(TQString::tqfromLatin1("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::fromLatin1("contexthelp") ) ); - layout->addWidget( button ); + button->setPixmap( Util::getSystemIcon( TQString::tqfromLatin1("contexthelp") ) ); + tqlayout->addWidget( button ); connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEnterWhatsThis())); _undo->setEnabled( false ); diff --git a/kregexpeditor/characterswidget.cpp b/kregexpeditor/characterswidget.cpp index 3926260..227f605 100644 --- a/kregexpeditor/characterswidget.cpp +++ b/kregexpeditor/characterswidget.cpp @@ -60,7 +60,7 @@ CharactersWidget::~CharactersWidget() } -TQSize CharactersWidget::sizeHint() const +TQSize CharactersWidget::tqsizeHint() const { TQFontMetrics metrics = fontMetrics(); _textSize = HackCalculateFontSize(metrics, title()); @@ -78,7 +78,7 @@ TQSize CharactersWidget::sizeHint() const void CharactersWidget::paintEvent(TQPaintEvent *e) { - TQSize mySize = sizeHint(); + TQSize mySize = tqsizeHint(); TQPainter painter(this); drawPossibleSelection( painter, mySize ); @@ -118,7 +118,7 @@ RegExp* CharactersWidget::regExp() const TQString CharactersWidget::text() const { - TQString res = TQString::fromLatin1(""); + TQString res = TQString::tqfromLatin1(""); if (_regexp->wordChar()) res += i18n("- A word character\n"); @@ -186,8 +186,8 @@ int CharactersWidget::edit() TQApplication::restoreOverrideCursor(); } - _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->sizeHint().width()/2, - _configWindow->sizeHint().height()/2)); + _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->tqsizeHint().width()/2, + _configWindow->tqsizeHint().height()/2)); int ret = _configWindow->exec(_regexp ); if ( ret == TQDialog::Accepted ) { _editorWindow->updateContent( 0 ); @@ -380,10 +380,10 @@ void CharacterEdits::slotOK() SingleEntry::SingleEntry(TQWidget* parent, const char* name ) :KMultiFormListBoxEntry( parent, name ) { - TQHBoxLayout* layout = new TQHBoxLayout( this, 3, 6 ); + TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 3, 6 ); _selector = new CharSelector( this ); - layout->addWidget( _selector ); - layout->addStretch(1); + tqlayout->addWidget( _selector ); + tqlayout->addStretch(1); } TQString SingleEntry::text() const @@ -405,19 +405,19 @@ bool SingleEntry::isEmpty() const RangeEntry::RangeEntry(TQWidget* parent, const char* name ) :KMultiFormListBoxEntry( parent, name ) { - TQHBoxLayout* layout = new TQHBoxLayout( this, 3, 6 ); + TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 3, 6 ); TQLabel* label = new TQLabel(i18n("From:"), this ); _from = new CharSelector( this ); - layout->addWidget( label ); - layout->addWidget( _from ); + tqlayout->addWidget( label ); + tqlayout->addWidget( _from ); - layout->addStretch(1); + tqlayout->addStretch(1); label = new TQLabel(i18n("end of range","To:"), this ); _to = new CharSelector( this ); - layout->addWidget( label ); - layout->addWidget( _to ); + tqlayout->addWidget( label ); + tqlayout->addWidget( _to ); } TQString RangeEntry::fromText() const diff --git a/kregexpeditor/characterswidget.h b/kregexpeditor/characterswidget.h index 576e6f1..ccc8852 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 sizeHint() const; + virtual TQSize tqsizeHint() 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 0434281..5f60475 100644 --- a/kregexpeditor/charselector.cpp +++ b/kregexpeditor/charselector.cpp @@ -26,7 +26,7 @@ #include "charselector.h" #include "limitedcharlineedit.h" #include "regexpconverter.h" -#include <layout.h> +#include <tqlayout.h> #include <tqwidgetstack.h> #include <tqcombobox.h> @@ -43,10 +43,10 @@ class StackContainer :public TQWidget public: StackContainer( TQWidget* child, TQWidget* parent ) : TQWidget( parent ) { - TQHBoxLayout* layout = new TQHBoxLayout( this ); + TQHBoxLayout* tqlayout = new TQHBoxLayout( this ); child->reparent( this, TQPoint(0,0), false ); - layout->addWidget( child ); - layout->addStretch( 1 ); + tqlayout->addWidget( child ); + tqlayout->addStretch( 1 ); } }; @@ -54,13 +54,13 @@ CharSelector::CharSelector( TQWidget* parent, const char* name ) :TQWidget( parent, name ), _oldIndex(0) { TQStringList items; - TQHBoxLayout* layout = new TQHBoxLayout( this, 0, 6 ); + TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 0, 6 ); _type = new TQComboBox( this, "_type" ); items << i18n("Normal Character") << i18n("Unicode Char in Hex.") << i18n("Unicode Char in Oct.") - << TQString::fromLatin1("----") + << TQString::tqfromLatin1("----") << i18n("The Bell Character (\\a)") << i18n("The Form Feed Character (\\f)") << i18n("The Line Feed Character (\\n)") @@ -68,10 +68,10 @@ CharSelector::CharSelector( TQWidget* parent, const char* name ) << i18n("TheQt::Horizontal Tab Character (\\t)") << i18n("TheQt::Vertical Tab Character (\\v)"); _type->insertStringList( items ); - layout->addWidget( _type ); + tqlayout->addWidget( _type ); _stack = new TQWidgetStack( this, "_stack" ); - layout->addWidget( _stack ); + tqlayout->addWidget( _stack ); _normal = new LimitedCharLineEdit( LimitedCharLineEdit::NORMAL, 0, "_normal" ); _stack->addWidget( new StackContainer( _normal, _stack ), 0 ); @@ -169,17 +169,17 @@ TQString CharSelector::text() const case 3: // The seperator break; case 4: - return TQString::fromLatin1("\\a"); + return TQString::tqfromLatin1("\\a"); case 5: - return TQString::fromLatin1("\\f"); + return TQString::tqfromLatin1("\\f"); case 6: - return TQString::fromLatin1("\\n"); + return TQString::tqfromLatin1("\\n"); case 7: - return TQString::fromLatin1("\\r"); + return TQString::tqfromLatin1("\\r"); case 8: - return TQString::fromLatin1("\\t"); + return TQString::tqfromLatin1("\\t"); case 9: - return TQString::fromLatin1("\\v"); + return TQString::tqfromLatin1("\\v"); } return TQString(); } diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp index cb60152..c43dcbb 100644 --- a/kregexpeditor/compoundwidget.cpp +++ b/kregexpeditor/compoundwidget.cpp @@ -26,7 +26,7 @@ #endif #include "compoundwidget.h" -#include <layout.h> +#include <tqlayout.h> #include <tqcursor.h> #include <tqlineedit.h> #include <tqpainter.h> @@ -40,8 +40,8 @@ CompoundDetailWindow::CompoundDetailWindow( TQWidget* parent, const char* name ) :TQWidget( parent, name ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setAutoAdd( true ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setAutoAdd( true ); TQLabel* label = new TQLabel( i18n("&Title:"), this); _title = new TQLineEdit( this ); @@ -135,10 +135,10 @@ void CompoundWidget::init( ) _backRefId = -1; } -TQSize CompoundWidget::sizeHint() const +TQSize CompoundWidget::tqsizeHint() const { TQFontMetrics metrics = fontMetrics(); - _childSize = _child->sizeHint(); + _childSize = _child->tqsizeHint(); _textSize = metrics.size( 0, _content->title() ); int width, height; @@ -164,7 +164,7 @@ TQSize CompoundWidget::sizeHint() const void CompoundWidget::paintEvent( TQPaintEvent *e ) { - TQSize mySize = sizeHint(); + TQSize mySize = tqsizeHint(); 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->sizeHint().width(), mySize.width()-2*pw), - _child->sizeHint().height()); + TQSize newSize = TQSize( TQMAX( _child->tqsizeHint().width(), mySize.width()-2*pw), + _child->tqsizeHint().height()); _child->move( pw, childY ); if ( curSize != newSize ) { @@ -247,7 +247,7 @@ void CompoundWidget::slotConfigCanceled() TQDataStream stream( _backup, IO_ReadOnly ); KWidgetStreamer streamer; streamer.fromStream( stream, TQT_TQOBJECT(_content) ); - repaint(); + tqrepaint(); } RegExp* CompoundWidget::regExp() const @@ -273,7 +273,7 @@ void CompoundWidget::mouseReleaseEvent( TQMouseEvent* event) TQRect( _pixmapPos, _pixmapSize ).contains( event->pos() ) ) { _hidden = !_hidden; _editorWindow->updateContent( 0 ); - repaint(); // is this necesary? + tqrepaint(); // is this necesary? _editorWindow->emitChange(); } else @@ -286,7 +286,7 @@ bool CompoundWidget::updateSelection( bool parentSelected ) bool changed = RegExpWidget::updateSelection( parentSelected ); _child->selectWidget( _isSelected ); if (changed) - repaint(); + tqrepaint(); return changed; } else { @@ -296,8 +296,8 @@ bool CompoundWidget::updateSelection( bool parentSelected ) int CompoundWidget::edit() { - _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->sizeHint().width()/2, - _configWindow->sizeHint().height()/2) ); + _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->tqsizeHint().width()/2, + _configWindow->tqsizeHint().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 ad16de8..047f942 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 sizeHint() const; + virtual TQSize tqsizeHint() const; virtual RegExp* regExp() const; virtual RegExpType type() const { return COMPOUND; } virtual int edit(); diff --git a/kregexpeditor/concregexp.cpp b/kregexpeditor/concregexp.cpp index cefbac4..1c8421d 100644 --- a/kregexpeditor/concregexp.cpp +++ b/kregexpeditor/concregexp.cpp @@ -29,7 +29,7 @@ void ConcRegExp::addRegExp( RegExp *regExp ) addChild( regExp ); } -RegExpList ConcRegExp::children() +RegExpList ConcRegExp::tqchildren() { return list; } diff --git a/kregexpeditor/concregexp.h b/kregexpeditor/concregexp.h index 47e3b26..15a0a66 100644 --- a/kregexpeditor/concregexp.h +++ b/kregexpeditor/concregexp.h @@ -31,7 +31,7 @@ public: ConcRegExp( bool selected ); void addRegExp( RegExp *); - RegExpList children(); + RegExpList tqchildren(); RegExp* lastRegExp(); virtual bool check( ErrorMap&, bool first, bool last ); diff --git a/kregexpeditor/concwidget.cpp b/kregexpeditor/concwidget.cpp index 8cbff9e..16690be 100644 --- a/kregexpeditor/concwidget.cpp +++ b/kregexpeditor/concwidget.cpp @@ -28,7 +28,7 @@ ConcWidget::ConcWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, init(); DragAccepter *accepter = new DragAccepter(editorWindow, this); accepter->show(); - _children.append(accepter); + _tqchildren.append(accepter); } @@ -38,7 +38,7 @@ ConcWidget::ConcWidget(RegExpEditorWindow* editorWindow, RegExpWidget *child, { init(); DragAccepter *accepter = new DragAccepter(editorWindow, this); - _children.append(accepter); + _tqchildren.append(accepter); child->reparent(this, TQPoint(0,0), false); addNewChild(accepter, child); } @@ -48,13 +48,13 @@ ConcWidget::ConcWidget( RegExpEditorWindow* editorWindow, ConcWidget* origConc, :MultiContainerWidget(editorWindow, 0, "Splitted ConcWidget") { init(); - _children.prepend( new DragAccepter(editorWindow, this) ); + _tqchildren.prepend( new DragAccepter(editorWindow, this) ); for (unsigned int i = end; i >= start; i--) { - RegExpWidget* child = origConc->_children.take( i ); - _children.prepend( child ); + RegExpWidget* child = origConc->_tqchildren.take( i ); + _tqchildren.prepend( child ); child->reparent( this, TQPoint(0,0), false); } - _children.prepend( new DragAccepter(editorWindow, this) ); + _tqchildren.prepend( new DragAccepter(editorWindow, this) ); } ConcWidget::ConcWidget( ConcRegExp* regexp, RegExpEditorWindow* editorWindow, @@ -63,9 +63,9 @@ ConcWidget::ConcWidget( ConcRegExp* regexp, RegExpEditorWindow* editorWindow, { init(); DragAccepter *accepter = new DragAccepter(editorWindow, this); - _children.append(accepter); + _tqchildren.append(accepter); - RegExpList list = regexp->children(); + RegExpList list = regexp->tqchildren(); for ( RegExpListIt it(list); *it; ++it ) { RegExpWidget* child = WidgetFactory::createWidget( *it, editorWindow, this ); append( child ); @@ -78,35 +78,35 @@ void ConcWidget::init() } -TQSize ConcWidget::sizeHint() const +TQSize ConcWidget::tqsizeHint() const { - int childrenWidth = 0; - int childrenHeight = 0; - TQPtrListIterator<RegExpWidget> it(_children); + int tqchildrenWidth = 0; + int tqchildrenHeight = 0; + TQPtrListIterator<RegExpWidget> it(_tqchildren); for ( ; *it; ++it) { - TQSize thisChildSize = (*it)->sizeHint(); - childrenWidth += thisChildSize.width(); - childrenHeight = TQMAX(childrenHeight, thisChildSize.height()); + TQSize thisChildSize = (*it)->tqsizeHint(); + tqchildrenWidth += thisChildSize.width(); + tqchildrenHeight = TQMAX(tqchildrenHeight, thisChildSize.height()); } - return TQSize(childrenWidth, childrenHeight); + return TQSize(tqchildrenWidth, tqchildrenHeight); } void ConcWidget::paintEvent( TQPaintEvent *e) { - Q_ASSERT( dynamic_cast<DragAccepter*>(_children.at(0)) ); + Q_ASSERT( dynamic_cast<DragAccepter*>(_tqchildren.at(0)) ); // if this fails, then I should check the location of the show() - Q_ASSERT( _children.count() == 1 || - ( _children.count() >=3 && - dynamic_cast<DragAccepter*>(_children.at(_children.count()-1)) ) ); + Q_ASSERT( _tqchildren.count() == 1 || + ( _tqchildren.count() >=3 && + dynamic_cast<DragAccepter*>(_tqchildren.at(_tqchildren.count()-1)) ) ); - if ( _children.count() == 1) { + if ( _tqchildren.count() == 1) { // There is only an accepter, lets give it all the space. - _children.at(0)->setGeometry( 0, 0, size().width(), size().height() ); + _tqchildren.at(0)->setGeometry( 0, 0, size().width(), size().height() ); } else { - TQSize myReqSize = sizeHint(); + TQSize myReqSize = tqsizeHint(); TQSize mySize(TQMAX(myReqSize.width(), size().width()), TQMAX(myReqSize.height(), size().height())); @@ -125,18 +125,18 @@ void ConcWidget::paintEvent( TQPaintEvent *e) int lastHeight = 0; int offset = 0; - for (unsigned int i = 1; i < _children.count(); i += 2 ) { - DragAccepter* accepter = dynamic_cast<DragAccepter*>(_children.at(i-1)); + for (unsigned int i = 1; i < _tqchildren.count(); i += 2 ) { + DragAccepter* accepter = dynamic_cast<DragAccepter*>(_tqchildren.at(i-1)); if (!accepter) continue; - RegExpWidget* child = _children.at(i); + RegExpWidget* child = _tqchildren.at(i); - TQSize childSize = child->sizeHint(); + TQSize childSize = child->tqsizeHint(); TQSize curChildSize = child->size(); //----------------------------- first place the accepter int x = offset; - int w = accepter->sizeHint().width(); + int w = accepter->tqsizeHint().width(); if ( i == 1 ) w+= extra; int h = TQMAX( lastHeight, childSize.height() ); int y = (mySize.height() - h)/2; @@ -176,11 +176,11 @@ void ConcWidget::paintEvent( TQPaintEvent *e) //---------------------- Finally place the last accepter. DragAccepter* accepter = - dynamic_cast<DragAccepter*>(_children.at(_children.count()-1)); + dynamic_cast<DragAccepter*>(_tqchildren.at(_tqchildren.count()-1)); // dynamic_cast is ASSERTed at top int x = offset; int h = lastHeight; - int w = accepter->sizeHint().width() + extra; + int w = accepter->tqsizeHint().width() + extra; int y = (mySize.height()-h)/2; accepter->setGeometry( x, y, w, h ); } @@ -212,10 +212,10 @@ void ConcWidget::sizeAccepter( DragAccepter* accepter, int height, int totHeight RegExp* ConcWidget::regExp() const { - TQPtrListIterator<RegExpWidget> it( _children ); + TQPtrListIterator<RegExpWidget> it( _tqchildren ); ++it; // start with the second element. - if ( _children.count() == 3 ) { + if ( _tqchildren.count() == 3 ) { // Exactly one child (and two drag accepters) return (*it)->regExp(); } @@ -236,17 +236,17 @@ bool ConcWidget::updateSelection(bool parentSelected) _maxSelectedHeight = 0; - TQPtrListIterator<RegExpWidget> it(_children); + TQPtrListIterator<RegExpWidget> it(_tqchildren); ++it; // Skip past the first DragAccepter for ( ; *it; it +=2 ) { if ( (*it)->isSelected() ) { - _maxSelectedHeight = TQMAX( _maxSelectedHeight, (*it)->sizeHint().height() ); + _maxSelectedHeight = TQMAX( _maxSelectedHeight, (*it)->tqsizeHint().height() ); } } changed = changed || isSel != _isSelected; if ( changed ) { - repaint(); + tqrepaint(); } return changed; @@ -259,8 +259,8 @@ void ConcWidget::getSelectionIndexes( int* start, int* end ) // Start with element at index 1, and skip every second element, as we // know they are dragAccepters. - for ( unsigned int index = 1; index< _children.count(); index += 2 ) { - RegExpWidget* child = _children.at(index); + for ( unsigned int index = 1; index< _tqchildren.count(); index += 2 ) { + RegExpWidget* child = _tqchildren.at(index); if ( child->isSelected() ) { // The child is selected at topmost level. @@ -276,7 +276,7 @@ void ConcWidget::getSelectionIndexes( int* start, int* end ) } if ( *start != -1 && *end == -1 ) - *end = _children.count() -2; + *end = _tqchildren.count() -2; } void ConcWidget::applyRegExpToSelection( RegExpType type ) @@ -287,7 +287,7 @@ void ConcWidget::applyRegExpToSelection( RegExpType type ) if ( start == -1 ) { // No item selected at top level - TQPtrListIterator<RegExpWidget> it(_children); + TQPtrListIterator<RegExpWidget> it(_tqchildren); ++it; // Skip past the first DragAccepter for ( ; *it ; it += 2 ) { if ( (*it)->hasSelection() ) { @@ -307,7 +307,7 @@ void ConcWidget::applyRegExpToSelection( RegExpType type ) subSequence->resize(0,0); // see note (1) subSequence->reparent( newElm, TQPoint(0,0), false); - _children.insert( start, newElm ); + _tqchildren.insert( start, newElm ); newElm->show(); } } @@ -318,7 +318,7 @@ bool ConcWidget::isSelected() const // A ConcWidget should be considered selected when all its elements has been selected // otherwise empty ConcWidgets may be left behind when for example selection is deleted. bool allSelected = true; - TQPtrListIterator<RegExpWidget> it(_children); + TQPtrListIterator<RegExpWidget> it(_tqchildren); ++it; // Skip past first DragAccepter. for ( ; *it && allSelected; it += 2 ) { allSelected = allSelected && (*it)->isSelected(); @@ -336,7 +336,7 @@ RegExp* ConcWidget::selection() const bool foundMoreThanOne = false; RegExp* regexp = 0; - TQPtrListIterator<RegExpWidget> it(_children); + TQPtrListIterator<RegExpWidget> it(_tqchildren); ++it; // Skip past the first DragAccepter for ( ; (*it) ; it += 2 ) { if ( (*it)->hasSelection() ) { @@ -363,21 +363,21 @@ RegExp* ConcWidget::selection() const void ConcWidget::addNewConcChild(DragAccepter *accepter, ConcWidget *other) { - for ( unsigned int i=0; i<_children.count(); i+= 2 ) { - RegExpWidget *ch = _children.at( i ); + for ( unsigned int i=0; i<_tqchildren.count(); i+= 2 ) { + RegExpWidget *ch = _tqchildren.at( i ); if ( ch == accepter ) { // Move all the element from the `child' ConcWidget to this one. // Do not copy the first one as this is a dragAccepter, and we place the widgets // after this drag accepter. // We must take them in pairs to avoid breaking the invariant for paintEvent, // namely that every second element is a dragAccepter - for ( unsigned int j = other->_children.count()-1; j > 0 ; j-=2 ) { - RegExpWidget* newChildA = other->_children.take(j); + for ( unsigned int j = other->_tqchildren.count()-1; j > 0 ; j-=2 ) { + RegExpWidget* newChildA = other->_tqchildren.take(j); newChildA->reparent( this, TQPoint(0,0), false); - _children.insert( i+1, newChildA ); - RegExpWidget* newChildB = other->_children.take(j-1); + _tqchildren.insert( i+1, newChildA ); + RegExpWidget* newChildB = other->_tqchildren.take(j-1); newChildB->reparent( this, TQPoint(0,0), false); - _children.insert( i+1, newChildB ); + _tqchildren.insert( i+1, newChildB ); newChildA->show(); newChildB->show(); } @@ -391,7 +391,7 @@ void ConcWidget::addNewConcChild(DragAccepter *accepter, ConcWidget *other) bool ConcWidget::validateSelection() const { bool cont = true; - TQPtrListIterator<RegExpWidget> it(_children); + TQPtrListIterator<RegExpWidget> it(_tqchildren); ++it; // skip past the DragAccepter. for ( ; *it && cont; it += 2 ) { cont = (*it)->validateSelection(); diff --git a/kregexpeditor/concwidget.h b/kregexpeditor/concwidget.h index 9a4820c..bff85a7 100644 --- a/kregexpeditor/concwidget.h +++ b/kregexpeditor/concwidget.h @@ -40,7 +40,7 @@ public: TQWidget* parent, const char* name = 0); void init(); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual RegExp* regExp() const; virtual bool updateSelection(bool parentSelected); virtual bool isSelected() const; @@ -52,7 +52,7 @@ public: virtual bool validateSelection() const; virtual bool acceptWidgetInsert( RegExpType ) const { return false; } virtual bool acceptWidgetPaste() const { return false; } - bool hasAnyChildren() { return _children.count() > 1; } + bool hasAnyChildren() { return _tqchildren.count() > 1; } protected: virtual void paintEvent( TQPaintEvent *e ); diff --git a/kregexpeditor/drag.cpp b/kregexpeditor/drag.cpp index e17973c..9c2b1ca 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->encodedData("KRegExpEditor/widgetdrag" ); + TQByteArray payload = event->tqencodedData("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::encodedData ( const char* format ) const +TQByteArray RegExpWidgetDrag::tqencodedData ( const char* format ) const { TQByteArray data; TQTextStream stream( data, IO_WriteOnly ); diff --git a/kregexpeditor/drag.h b/kregexpeditor/drag.h index e32b02e..699d1e8 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 encodedData ( const char * ) const; + virtual TQByteArray tqencodedData ( 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 f336dbd..6bd049e 100644 --- a/kregexpeditor/dragaccepter.cpp +++ b/kregexpeditor/dragaccepter.cpp @@ -28,7 +28,7 @@ DragAccepter::DragAccepter(RegExpEditorWindow* editorWindow, RegExpWidget *paren setAcceptDrops(TRUE); } -TQSize DragAccepter::sizeHint() const +TQSize DragAccepter::tqsizeHint() 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()->topLevelWidget() == topLevelWidget() && _isSelected ); + bool selfDrag = ( event->source() && event->source()->tqtopLevelWidget() == tqtopLevelWidget() && _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()->topLevelWidget() == topLevelWidget() ); + bool selfDrag = ( event->source() && event->source()->tqtopLevelWidget() == tqtopLevelWidget() ); if ( ! selfDrag ) _editorWindow->clearSelection( true ); else { diff --git a/kregexpeditor/dragaccepter.h b/kregexpeditor/dragaccepter.h index c9c6fd8..a3737d9 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 sizeHint() const; + TQSize tqsizeHint() 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 0ba9367..8e3cc20 100644 --- a/kregexpeditor/editorwindow.cpp +++ b/kregexpeditor/editorwindow.cpp @@ -31,11 +31,11 @@ #include "editorwindow.h" #include "concwidget.h" -#include <layout.h> +#include <tqlayout.h> #include <tqpainter.h> #include <tqaccel.h> #include <tqcursor.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqpopupmenu.h> #include "regexp.h" #include "userdefinedregexps.h" @@ -209,8 +209,8 @@ void RegExpEditorWindow::slotDoSelect() _pasteInAction = false; _insertInAction = false; - // I need to update the cursor recursively, as a repaint may not have been issued yet - // when this method is invoked. This means that when the repaint comes, the cursor may + // I need to update the cursor recursively, as a tqrepaint may not have been issued yet + // when this method is invoked. This means that when the tqrepaint comes, the cursor may // move to an other widget. _top->updateCursorRecursively(); } @@ -236,9 +236,9 @@ void RegExpEditorWindow::updateContent( TQWidget* focusChild) emit contentChanged( p ); } -TQSize RegExpEditorWindow::sizeHint() const +TQSize RegExpEditorWindow::tqsizeHint() const { - return _top->sizeHint(); + return _top->tqsizeHint(); } void RegExpEditorWindow::paintEvent( TQPaintEvent* event ) @@ -289,7 +289,7 @@ void RegExpEditorWindow::cutCopyAux( TQPoint pos ) RegExpWidgetDrag *clipboardData = new RegExpWidgetDrag( regexp, this ); delete regexp; - TQClipboard* clipboard = tqApp->clipboard(); + TQClipboard* clipboard = tqApp->tqclipboard(); clipboard->setData( clipboardData ); emit anythingOnClipboard( true ); emit canSave( _top->hasAnyChildren() ); @@ -298,7 +298,7 @@ void RegExpEditorWindow::cutCopyAux( TQPoint pos ) void RegExpEditorWindow::slotStartPasteAction() { - TQByteArray data = tqApp->clipboard()->data()->encodedData( "KRegExpEditor/widgetdrag" ); + TQByteArray data = tqApp->tqclipboard()->data()->tqencodedData( "KRegExpEditor/widgetdrag" ); TQTextStream stream( data, IO_ReadOnly ); TQString str = stream.read(); @@ -335,7 +335,7 @@ void RegExpEditorWindow::showRMBMenu( bool enableCutCopy ) _menu->setItemEnabled( CUT, enableCutCopy ); _menu->setItemEnabled( COPY, enableCutCopy ); - if ( ! tqApp->clipboard()->data()->provides( "KRegExpEditor/widgetdrag" ) ) + if ( ! tqApp->tqclipboard()->data()->provides( "KRegExpEditor/widgetdrag" ) ) _menu->setItemEnabled( PASTE, false ); else _menu->setItemEnabled( PASTE, true ); @@ -383,14 +383,14 @@ void RegExpEditorWindow::slotSave() TQString fileName = dir + TQString::fromLocal8Bit("/") + txt + TQString::fromLocal8Bit(".regexp"); TQFileInfo finfo( fileName ); if ( finfo.exists() ) { - int answer = KMessageBox::warningContinueCancel( this, i18n("<p>Overwrite named regular expression <b>%1</b></p>").arg(txt), TQString(), i18n("Overwrite")); + int answer = KMessageBox::warningContinueCancel( this, i18n("<p>Overwrite named regular expression <b>%1</b></p>").tqarg(txt), TQString(), i18n("Overwrite")); if ( answer != KMessageBox::Continue ) return; } TQFile file( fileName ); if ( ! file.open(IO_WriteOnly) ) { - KMessageBox::sorry( this, i18n("Could not open file for writing: %1").arg(fileName) ); + KMessageBox::sorry( this, i18n("Could not open file for writing: %1").tqarg(fileName) ); return; } @@ -431,7 +431,7 @@ void RegExpEditorWindow::updateCursorUnderPoint() { RegExpWidget* widget = _top->widgetUnderPoint( TQCursor::pos(), false ); if ( widget ) - widget->updateCursorShape(); + widget->updatetqCursorShape(); } void RegExpEditorWindow::emitVerifyRegExp() diff --git a/kregexpeditor/editorwindow.h b/kregexpeditor/editorwindow.h index 0d20597..58377c6 100644 --- a/kregexpeditor/editorwindow.h +++ b/kregexpeditor/editorwindow.h @@ -110,7 +110,7 @@ public: */ void showRMBMenu( bool enableCutCopy ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: @@ -232,7 +232,7 @@ private: /** This points to the top @ref RegExpWidget in the editor window. */ ConcWidget *_top; - /** This points to the layout manager for the editor window */ + /** This points to the tqlayout manager for the editor window */ TQHBoxLayout* _layout; /** Start point and last point draw. Used when doing rubber band selection */ diff --git a/kregexpeditor/emacsregexpconverter.cpp b/kregexpeditor/emacsregexpconverter.cpp index 491e989..0d0f6d4 100644 --- a/kregexpeditor/emacsregexpconverter.cpp +++ b/kregexpeditor/emacsregexpconverter.cpp @@ -40,10 +40,10 @@ TQString EmacsRegExpConverter::toString( AltnRegExp* regexp, bool markSelection TQString res; bool first = true; - RegExpList list = regexp->children(); + RegExpList list = regexp->tqchildren(); for ( RegExpListIt it(list); *it; ++it ) { if ( !first ) { - res += TQString::fromLatin1("\\|"); + res += TQString::tqfromLatin1("\\|"); } first = false; res += toStr( *it, markSelection ); @@ -56,13 +56,13 @@ TQString EmacsRegExpConverter::toString( ConcRegExp* regexp, bool markSelection { TQString res; - RegExpList list = regexp->children(); + RegExpList list = regexp->tqchildren(); for ( RegExpListIt it(list); *it; ++it ) { TQString startPar = TQString::fromLocal8Bit(""); TQString endPar = TQString::fromLocal8Bit(""); if ( (*it)->precedence() < regexp->precedence() ) { - startPar = TQString::fromLatin1( "\\(" ); - endPar = TQString::fromLatin1( "\\)" ); + startPar = TQString::tqfromLatin1( "\\(" ); + endPar = TQString::tqfromLatin1( "\\)" ); } 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::fromLatin1("-")+ (*it)->second()); + txt.append((*it)->first()+ TQString::tqfromLatin1("-")+ (*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::fromLatin1("["); + TQString res = TQString::tqfromLatin1("["); if ( regexp->negate() ) - res.append(TQString::fromLatin1("^")); + res.append(TQString::tqfromLatin1("^")); // a ']' must be the first character in teh range. if ( foundParenthesis ) { - res.append(TQString::fromLatin1("]")); + res.append(TQString::tqfromLatin1("]")); } // a '-' must be the first character ( only coming after a ']') if ( foundDash ) { - res.append(TQString::fromLatin1("-")); + res.append(TQString::tqfromLatin1("-")); } res += txt; @@ -153,7 +153,7 @@ TQString EmacsRegExpConverter::toString( TextRangeRegExp* regexp, bool /*markSel res.append( TQChar( '^' ) ); } - res.append(TQString::fromLatin1("]")); + res.append(TQString::tqfromLatin1("]")); return res; } @@ -165,7 +165,7 @@ TQString EmacsRegExpConverter::toString( CompoundRegExp* regexp, bool markSelect TQString EmacsRegExpConverter::toString( DotRegExp* /*regexp*/, bool /*markSelection*/ ) { - return TQString::fromLatin1( "." ); + return TQString::tqfromLatin1( "." ); } 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::fromLatin1("^"); + return TQString::tqfromLatin1("^"); case PositionRegExp::ENDLINE: - return TQString::fromLatin1("$"); + return TQString::tqfromLatin1("$"); 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::fromLatin1(""); + return TQString::tqfromLatin1(""); } } - return TQString::fromLatin1(""); + return TQString::tqfromLatin1(""); } 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::fromLatin1( "\\(" ); - endPar = TQString::fromLatin1( "\\)" ); + startPar = TQString::tqfromLatin1( "\\(" ); + endPar = TQString::tqfromLatin1( "\\)" ); } 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::fromLatin1(""); + TQString res = TQString::tqfromLatin1(""); for ( int i = 0; i < regexp->min(); ++i ) { - res += TQString::fromLatin1( "\\(" ) + cText + TQString::fromLatin1( "\\)" ); + res += TQString::tqfromLatin1( "\\(" ) + cText + TQString::tqfromLatin1( "\\)" ); } if ( regexp->max() != -1 ) { for ( int i = regexp->min(); i < regexp->max(); ++i ) { - res += TQString::fromLatin1("\\(") + cText + TQString::fromLatin1("\\)?"); + res += TQString::tqfromLatin1("\\(") + cText + TQString::tqfromLatin1("\\)?"); } } else - res += TQString::fromLatin1("+"); + res += TQString::tqfromLatin1("+"); return res; } @@ -244,7 +244,7 @@ TQString EmacsRegExpConverter::toString( TextRegExp* regexp, bool /*markSelectio TQString EmacsRegExpConverter::name() { - return TQString::fromLatin1( "Emacs" ); + return TQString::tqfromLatin1( "Emacs" ); } int EmacsRegExpConverter::features() diff --git a/kregexpeditor/errormap.cpp b/kregexpeditor/errormap.cpp index 65ca557..41a8c00 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::fromLatin1("KRegExpEditorLineStartError") ); + i18n("Regular Expression Error"), TQString::tqfromLatin1("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::fromLatin1("KRegExpEditorLineEndError") ); + i18n("Regular Expression Error"), TQString::tqfromLatin1("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::fromLatin1("KRegExpEditorLookAHeadError") ); + i18n("Regular Expression Error"), TQString::tqfromLatin1("KRegExpEditorLookAHeadError") ); } _lookAHeadError = true; } diff --git a/kregexpeditor/gen_qregexpparser.cc b/kregexpeditor/gen_qregexpparser.cc index f2ac58a..8a7b5bf 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::fromLatin1("") ) ); + dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( new TextRegExp( false, TQString::tqfromLatin1("") ) ); } 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::fromLatin1("") ) ); + dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( new TextRegExp( false, TQString::tqfromLatin1("") ) ); dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( yyvsp[0].regexp ); } break; @@ -1160,7 +1160,7 @@ yyreduce: case 23: #line 157 "qregexpparser.y" { - TQString match = TQString(TQString::fromLocal8Bit("\\%1")).arg( yyvsp[0].backRef ); + TQString match = TQString(TQString::fromLocal8Bit("\\%1")).tqarg( yyvsp[0].backRef ); yyval.regexp = new TextRegExp( false, match ); KMessageBox::information(0,i18n("<qt>Back reference regular expressions are not supported.<p>" "<tt>\\1</tt>, <tt>\\2</tt>, ... are <i>back references</i>, meaning they refer to " @@ -1170,7 +1170,7 @@ yyreduce: "just a workaround to ensure that the application handles the regexp at all. " "Therefore, as soon as you edit the regular expression in the graphical area, " "the back reference will be replaced by matching the text <b>%2</b> literally.") - .arg( match ).arg( match ), + .tqarg( match ).tqarg( match ), i18n("Back reference regular expressions not supported"), TQString::fromLocal8Bit("backReferenceNotSupported") ); } @@ -1192,13 +1192,13 @@ yyreduce: if ( yyvsp[0].ch == '{' || yyvsp[0].ch == '}' || yyvsp[0].ch == '[' || yyvsp[0].ch == ']' || yyvsp[0].ch == '\\' ) { yyerror( "illigal character - needs escaping" ); } - yyval.regexp = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).arg(yyvsp[0].ch)); + yyval.regexp = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).tqarg(yyvsp[0].ch)); } break; case 27: #line 182 "qregexpparser.y" - { yyval.regexp = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).arg(yyvsp[0].ch)); } + { yyval.regexp = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).tqarg(yyvsp[0].ch)); } break; diff --git a/kregexpeditor/infopage.cpp b/kregexpeditor/infopage.cpp index bd192e2..42d473e 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::fromLatin1( "<qt>" ) + + TQString::tqfromLatin1( "<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> <<a href=\"mailto:blackie@kde.org\">blackie@kde.org</a>>") - + TQString::fromLatin1( "</qt>" ); + + TQString::tqfromLatin1( "</qt>" ); setText( txt ); } void InfoPage::setSource ( const TQString& name ) { #ifdef TQT_ONLY - mimeSourceFactory()->setFilePath( TQStringList() << TQString::fromLatin1("manual/")); + mimeSourceFactory()->setFilePath( TQStringList() << TQString::tqfromLatin1("manual/")); TQString nm = name; if ( nm.endsWith("/") ) nm = nm.left( nm.length()-1); diff --git a/kregexpeditor/infopage.h b/kregexpeditor/infopage.h index f73e284..24796d2 100644 --- a/kregexpeditor/infopage.h +++ b/kregexpeditor/infopage.h @@ -20,7 +20,7 @@ #ifdef TQT_ONLY #include "compat.h" - #include <textbrowser.h> + #include <tqtextbrowser.h> #else # include <ktextbrowser.h> #endif diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp index 5260140..95c0f25 100644 --- a/kregexpeditor/kregexpeditorgui.cpp +++ b/kregexpeditor/kregexpeditorgui.cpp @@ -29,7 +29,7 @@ // #include <unistd.h> // DO I need this? #include <stdio.h> #include "kregexpeditorprivate.h" -#include <layout.h> +#include <tqlayout.h> const TQString KRegExpEditorGUI::version = TQString::fromLocal8Bit("1.0"); @@ -38,9 +38,9 @@ KRegExpEditorGUI::KRegExpEditorGUI(TQWidget *parent, const char *name, const TQStringList & ) : TQWidget( parent, name) { - TQHBoxLayout* layout = new TQHBoxLayout( this, 6 ); + TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 6 ); _editor = new KRegExpEditorPrivate( this, "_editor" ); - layout->addWidget( _editor ); + tqlayout->addWidget( _editor ); connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); connect( _editor, TQT_SIGNAL( canRedo(bool) ), this, TQT_SIGNAL( canRedo(bool) ) ); connect( _editor, TQT_SIGNAL( changes(bool) ), this, TQT_SIGNAL( changes(bool) ) ); @@ -74,8 +74,8 @@ KRegExpEditorGUIDialog::KRegExpEditorGUIDialog( TQWidget *parent, parent, name ? name : "KRegExpDialog" ) { TQFrame* frame = plainPage(); - TQVBoxLayout* layout = new TQVBoxLayout( frame, 6 ); - layout->setAutoAdd( true ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( frame, 6 ); + tqlayout->setAutoAdd( true ); _editor = new KRegExpEditorGUI( frame ); connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); @@ -117,20 +117,20 @@ void KRegExpEditorGUIDialog::doSomething( TQString method, void* arguments ) void KRegExpEditorGUI::doSomething( TQString method, void* arguments ) { - if ( method == TQString::fromLatin1( "setCaseSensitive" ) ) { + if ( method == TQString::tqfromLatin1( "setCaseSensitive" ) ) { _editor->setCaseSensitive( (bool) arguments ); } - else if ( method == TQString::fromLatin1("setMinimal") ) { + else if ( method == TQString::tqfromLatin1("setMinimal") ) { _editor->setMinimal( (bool) arguments ); } - else if ( method == TQString::fromLatin1("setSyntax") ) { + else if ( method == TQString::tqfromLatin1("setSyntax") ) { _editor->setSyntax( *((TQString*) arguments) ); } - else if ( method == TQString::fromLatin1("setAllowNonTQtSyntax") ) { + else if ( method == TQString::tqfromLatin1("setAllowNonTQtSyntax") ) { _editor->setAllowNonTQtSyntax( (bool) arguments ); } else { - qFatal( "%s", tqtr("Method '%1' is not valid!").arg(method).latin1() ); + qFatal( "%s", tqtr("Method '%1' is not valid!").tqarg(method).latin1() ); } } diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp index 08e661e..5d9df7a 100644 --- a/kregexpeditor/kregexpeditorprivate.cpp +++ b/kregexpeditor/kregexpeditorprivate.cpp @@ -154,17 +154,17 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) // Line Edit - TQHBoxLayout* layout = new TQHBoxLayout( topLayout, 6 ); + TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout, 6 ); TQLabel* label = new TQLabel( i18n("ASCII syntax:"), this ); - layout->addWidget( label ); + tqlayout->addWidget( label ); clearButton = new TQToolButton( this ); - const TQString icon( TQString::fromLatin1( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) ); + const TQString icon( TQString::tqfromLatin1( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) ); TQIconSet clearIcon = SmallIconSet( icon ); clearButton->setIconSet( clearIcon ); - layout->addWidget( clearButton ); + tqlayout->addWidget( clearButton ); TQToolTip::add( clearButton, i18n("Clear expression") ); _regexpEdit = new TQLineEdit( this ); - layout->addWidget( _regexpEdit ); + tqlayout->addWidget( _regexpEdit ); TQWhatsThis::add( _regexpEdit, i18n( "This is the regular expression in ASCII syntax. You are likely only " "to be interested in this if you are a programmer, and need to " "develop a regular expression using TQRegExp.<p>" @@ -174,11 +174,11 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) #ifdef TQT_ONLY TQPixmap pix( "icons/error.png" ); #else - TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/error.png") ), KIcon::Toolbar ); + TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::tqfromLatin1("kregexpeditor/pics/error.png") ), KIcon::Toolbar ); #endif _error = new TQLabel( this ); _error->setPixmap( pix ); - layout->addWidget( _error ); + tqlayout->addWidget( _error ); _error->hide(); _timer = new TQTimer(this); @@ -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::fromLatin1( "TQt" ) ); + setSyntax( TQString::tqfromLatin1( "TQt" ) ); } TQString KRegExpEditorPrivate::regexp() @@ -371,7 +371,7 @@ void KRegExpEditorPrivate::setVerifyText( const TQString& fileName ) _autoVerify = false; TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { - KMessageBox::sorry(0, i18n("Could not open file '%1' for reading").arg( fileName ) ); + KMessageBox::sorry(0, i18n("Could not open file '%1' for reading").tqarg( fileName ) ); } else { TQTextStream s( &file ); diff --git a/kregexpeditor/limitedcharlineedit.cpp b/kregexpeditor/limitedcharlineedit.cpp index 5e494d8..59a6309 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, sizeHint().height()); + setFixedSize( fontMetrics().width('A')*5+5, tqsizeHint().height()); setValidator( new Validator( mode, this ) ); } diff --git a/kregexpeditor/lookaheadwidget.cpp b/kregexpeditor/lookaheadwidget.cpp index 5ae0b9d..c5dc700 100644 --- a/kregexpeditor/lookaheadwidget.cpp +++ b/kregexpeditor/lookaheadwidget.cpp @@ -60,13 +60,13 @@ RegExp* LookAheadWidget::regExp() const _child->regExp() ); } -TQSize LookAheadWidget::sizeHint() const +TQSize LookAheadWidget::tqsizeHint() const { - // TODO: Merge with RepeatWidget::sizeHint + // TODO: Merge with RepeatWidget::tqsizeHint TQFontMetrics metrics = fontMetrics(); _textSize = metrics.size( 0, _text ); - _childSize = _child->sizeHint(); + _childSize = _child->tqsizeHint(); 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::sizeHint() const void LookAheadWidget::paintEvent( TQPaintEvent *e ) { // TODO: Merge with RepeatWidget::paintEvent - TQSize mySize = sizeHint(); + TQSize mySize = tqsizeHint(); TQPainter painter(this); drawPossibleSelection( painter, mySize ); diff --git a/kregexpeditor/lookaheadwidget.h b/kregexpeditor/lookaheadwidget.h index 36c4e42..302090a 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 sizeHint() const; + virtual TQSize tqsizeHint() const; virtual RegExpWidget* findWidgetToEdit( TQPoint globalPos ); diff --git a/kregexpeditor/main.cpp b/kregexpeditor/main.cpp index 4df14ca..58c569d 100644 --- a/kregexpeditor/main.cpp +++ b/kregexpeditor/main.cpp @@ -28,7 +28,7 @@ #endif #include "kregexpeditorgui.h" -#include <layout.h> +#include <tqlayout.h> int main( int argc, char* argv[] ) { @@ -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::fromLatin1("setAllowNonTQtSyntax"), (bool*) true ); + iface->doSomething( TQString::tqfromLatin1("setAllowNonTQtSyntax"), (bool*) true ); lay->addWidget( iface ); TQHBoxLayout* lay2 = new TQHBoxLayout( lay, 6 ); diff --git a/kregexpeditor/multicontainerwidget.cpp b/kregexpeditor/multicontainerwidget.cpp index bd578d2..d8bef97 100644 --- a/kregexpeditor/multicontainerwidget.cpp +++ b/kregexpeditor/multicontainerwidget.cpp @@ -27,8 +27,8 @@ MultiContainerWidget::MultiContainerWidget( RegExpEditorWindow* editorWindow, void MultiContainerWidget::append( RegExpWidget* child ) { child->reparent( this, TQPoint(0,0), false ); - _children.append( child ); - _children.append( new DragAccepter( _editorWindow, this ) ); + _tqchildren.append( child ); + _tqchildren.append( new DragAccepter( _editorWindow, this ) ); } bool MultiContainerWidget::hasSelection() const @@ -36,7 +36,7 @@ bool MultiContainerWidget::hasSelection() const if ( _isSelected ) return true; - TQPtrListIterator<RegExpWidget> it(_children); + TQPtrListIterator<RegExpWidget> it(_tqchildren); ++it; // Move past the first dragAccepter for ( ; *it; it += 2 ) { if ( (*it)->hasSelection() ) { @@ -49,8 +49,8 @@ bool MultiContainerWidget::hasSelection() const void MultiContainerWidget::clearSelection() { _isSelected = false; - for ( unsigned int i = 0; i< _children.count(); i++ ) { - _children.at(i)->clearSelection(); + for ( unsigned int i = 0; i< _tqchildren.count(); i++ ) { + _tqchildren.at(i)->clearSelection(); } } @@ -58,15 +58,15 @@ void MultiContainerWidget::clearSelection() void MultiContainerWidget::deleteSelection() { // run from the back to the front (which we do since we delete items on the run) - // When deleting children, delete the drag accepter to its right. - for ( int i = (int) _children.count()-2; i > 0; i -=2 ) { + // When deleting tqchildren, delete the drag accepter to its right. + for ( int i = (int) _tqchildren.count()-2; i > 0; i -=2 ) { - RegExpWidget* child = _children.at( i ); + RegExpWidget* child = _tqchildren.at( i ); if ( child->isSelected() ) { - delete _children.at( i+1 ); - _children.remove( i+1 ); + delete _tqchildren.at( i+1 ); + _tqchildren.remove( i+1 ); delete child; - _children.remove(i); + _tqchildren.remove(i); } else if ( child->hasSelection() ) { child->deleteSelection(); @@ -78,16 +78,16 @@ void MultiContainerWidget::deleteSelection() void MultiContainerWidget::addNewChild(DragAccepter *accepter, RegExpWidget *child) { - for ( unsigned int i=0; i<_children.count(); i+= 2 ) { - RegExpWidget *ch = _children.at( i ); + for ( unsigned int i=0; i<_tqchildren.count(); i+= 2 ) { + RegExpWidget *ch = _tqchildren.at( i ); if ( ch == accepter ) { // Insert the new child - _children.insert( i+1, child ); + _tqchildren.insert( i+1, child ); // Insert an accepter as the next element. DragAccepter *accepter = new DragAccepter( _editorWindow, this ); - _children.insert( i+2, accepter ); + _tqchildren.insert( i+2, accepter ); // These two show's must come here otherwise a paintevent // will be invoked, where the invariant, that a accepter is located at @@ -107,11 +107,11 @@ bool MultiContainerWidget::updateSelection(bool parentSelected) { bool changed = false; bool isSel = _isSelected; - TQMemArray<bool> oldState(_children.count()); - TQMemArray<bool> newState(_children.count()); + TQMemArray<bool> oldState(_tqchildren.count()); + TQMemArray<bool> newState(_tqchildren.count()); - for (int i = 0; i< (int)_children.count();i++) { - oldState[i] = _children.at(i)->isSelected(); + for (int i = 0; i< (int)_tqchildren.count();i++) { + oldState[i] = _tqchildren.at(i)->isSelected(); } RegExpWidget::updateSelection( parentSelected ); @@ -120,8 +120,8 @@ bool MultiContainerWidget::updateSelection(bool parentSelected) int last; // scan for the first selected item. - for (first = 1; first < (int) _children.count(); first+= 2 ) { - RegExpWidget* child = _children.at(first); + for (first = 1; first < (int) _tqchildren.count(); first+= 2 ) { + RegExpWidget* child = _tqchildren.at(first); changed = child->updateSelection( _isSelected ) || changed; newState[first] = child->isSelected(); if ( child->isSelected() ) @@ -129,8 +129,8 @@ bool MultiContainerWidget::updateSelection(bool parentSelected) } // scan for the last selected item - for (last = _children.count()-2; last>first; last -= 2) { - RegExpWidget* child = _children.at(last); + for (last = _tqchildren.count()-2; last>first; last -= 2) { + RegExpWidget* child = _tqchildren.at(last); changed = child->updateSelection( _isSelected ) || changed; newState[last] = child->isSelected(); if ( child->isSelected() ) @@ -139,17 +139,17 @@ bool MultiContainerWidget::updateSelection(bool parentSelected) // everything between first and last must be selected. for (int j = first+2; j<last; j+=2) { - RegExpWidget* child = _children.at(j); + RegExpWidget* child = _tqchildren.at(j); changed = child->updateSelection( true ) || changed; newState[j] = true; } // update drag accepters. - for (int k = 0; k< (int) _children.count(); k+=2) { - RegExpWidget* child = _children.at(k); + for (int k = 0; k< (int) _tqchildren.count(); k+=2) { + RegExpWidget* child = _tqchildren.at(k); bool select; - if ( k == 0 || k == (int)_children.count()-1) { + if ( k == 0 || k == (int)_tqchildren.count()-1) { // The elements at the border is only selected if the parent is selected. select = _isSelected; } @@ -164,12 +164,12 @@ bool MultiContainerWidget::updateSelection(bool parentSelected) if (accepter) accepter->_isSelected = select; if ( select != isChildSel ) - child->repaint(); + child->tqrepaint(); } changed = changed || isSel != _isSelected; if ( changed ) { - repaint(); + tqrepaint(); } return changed; @@ -183,7 +183,7 @@ TQRect MultiContainerWidget::selectionRect() const return TQRect( mapToGlobal( TQPoint(0,0) ), size() ); else { TQRect res; - TQPtrListIterator<RegExpWidget> it(_children); + TQPtrListIterator<RegExpWidget> it(_tqchildren); ++it; // Move past the first dragAccepter for ( ; *it; it +=2 ) { if ( (*it)->hasSelection() ) { @@ -216,8 +216,8 @@ RegExpWidget* MultiContainerWidget::widgetUnderPoint( TQPoint globalPos, bool ju incr = 1; } - for ( unsigned int i = start; i < _children.count(); i+=incr ) { - RegExpWidget* wid = _children.at(i)->widgetUnderPoint( globalPos, justVisibleWidgets ); + for ( unsigned int i = start; i < _tqchildren.count(); i+=incr ) { + RegExpWidget* wid = _tqchildren.at(i)->widgetUnderPoint( globalPos, justVisibleWidgets ); if ( wid ) return wid; } @@ -230,8 +230,8 @@ RegExpWidget* MultiContainerWidget::widgetUnderPoint( TQPoint globalPos, bool ju RegExpWidget* MultiContainerWidget::findWidgetToEdit( TQPoint globalPos ) { - for ( unsigned int i = 1; i < _children.count(); i+=2 ) { - RegExpWidget* wid = _children.at(i)->findWidgetToEdit( globalPos ); + for ( unsigned int i = 1; i < _tqchildren.count(); i+=2 ) { + RegExpWidget* wid = _tqchildren.at(i)->findWidgetToEdit( globalPos ); if ( wid ) return wid; } @@ -241,7 +241,7 @@ RegExpWidget* MultiContainerWidget::findWidgetToEdit( TQPoint globalPos ) void MultiContainerWidget::selectWidget( bool sel ) { RegExpWidget::selectWidget( sel ); - TQPtrListIterator<RegExpWidget> it(_children); + TQPtrListIterator<RegExpWidget> it(_tqchildren); for ( ; *it ; ++it ) { (*it)->selectWidget( sel ); } @@ -250,7 +250,7 @@ void MultiContainerWidget::selectWidget( bool sel ) void MultiContainerWidget::updateAll() { - for ( TQPtrListIterator<RegExpWidget> it(_children); *it ; ++it ) { + for ( TQPtrListIterator<RegExpWidget> it(_tqchildren); *it ; ++it ) { (*it)->updateAll(); } RegExpWidget::updateAll(); @@ -258,8 +258,8 @@ void MultiContainerWidget::updateAll() void MultiContainerWidget::updateCursorRecursively() { - for ( TQPtrListIterator<RegExpWidget> it(_children); *it ; ++it ) { + for ( TQPtrListIterator<RegExpWidget> it(_tqchildren); *it ; ++it ) { (*it)->updateCursorRecursively(); } - updateCursorShape(); + updatetqCursorShape(); } diff --git a/kregexpeditor/multicontainerwidget.h b/kregexpeditor/multicontainerwidget.h index 4dd6a58..560baa0 100644 --- a/kregexpeditor/multicontainerwidget.h +++ b/kregexpeditor/multicontainerwidget.h @@ -21,7 +21,7 @@ #include "regexpwidget.h" /** - Abstract RegExp widget class representing widgets having multible children. + Abstract RegExp widget class representing widgets having multible tqchildren. @internal */ class MultiContainerWidget :public RegExpWidget @@ -43,7 +43,7 @@ public: protected: void append( RegExpWidget* child ); - TQPtrList<RegExpWidget> _children; + TQPtrList<RegExpWidget> _tqchildren; }; diff --git a/kregexpeditor/myfontmetrics.cpp b/kregexpeditor/myfontmetrics.cpp index 05b4ef3..38eb7dd 100644 --- a/kregexpeditor/myfontmetrics.cpp +++ b/kregexpeditor/myfontmetrics.cpp @@ -19,7 +19,7 @@ TQSize HackCalculateFontSize(TQFontMetrics fm, TQString str ) { - TQStringList list = TQStringList::split( TQString::fromLatin1("\n"), str ); + TQStringList list = TQStringList::split( TQString::tqfromLatin1("\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 080dc2c..6e9dc5e 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::fromLatin1("") ) ); + dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, QString::tqfromLatin1("") ) ); } | TOK_Bar term { $<regexp>$ = new AltnRegExp( false ); - dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, QString::fromLatin1("") ) ); + dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, QString::tqfromLatin1("") ) ); dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( $<regexp>2 ); } | TOK_Bar { $<regexp>$ = new AltnRegExp( false ); } @@ -155,7 +155,7 @@ atom : TOK_LeftParen expression TOK_RightParent { | TOK_Carat { $<regexp>$ = new PositionRegExp( false, PositionRegExp::BEGLINE ); } | TOK_Dot { $<regexp>$ = new DotRegExp( false ); } | TOK_BackRef { - QString match = TQString(TQString::fromLocal8Bit("\\%1")).arg( $<backRef>1 ); + QString match = TQString(TQString::fromLocal8Bit("\\%1")).tqarg( $<backRef>1 ); $<regexp>$ = new TextRegExp( false, match ); KMessageBox::information(0,i18n("<qt>Back reference regular expressions are not supported.<p>" "<tt>\\1</tt>, <tt>\\2</tt>, ... are <i>back references</i>, meaning they refer to " @@ -165,7 +165,7 @@ atom : TOK_LeftParen expression TOK_RightParent { "just a workaround to ensure that the application handles the regexp at all. " "Therefore, as soon as you edit the regular expression in the graphical area, " "the back reference will be replaced by matching the text <b>%2</b> literally.") - .arg( match ).arg( match ), + .tqarg( match ).tqarg( match ), i18n("Back reference regular expressions not supported"), QString::fromLocal8Bit("backReferenceNotSupported") ); } @@ -177,9 +177,9 @@ char : TOK_Char { if ( $<ch>1 == '{' || $<ch>1 == '}' || $<ch>1 == '[' || $<ch>1 == ']' || $<ch>1 == '\\' ) { yyerror( "illigal character - needs escaping" ); } - $<regexp>$ = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).arg($<ch>1)); + $<regexp>$ = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).tqarg($<ch>1)); } - | TOK_EscapeChar { $<regexp>$ = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).arg($<ch>1)); } + | TOK_EscapeChar { $<regexp>$ = new TextRegExp( false, TQString(TQString::fromLocal8Bit("%1")).tqarg($<ch>1)); } ; %% diff --git a/kregexpeditor/qt-only/compat.h b/kregexpeditor/qt-only/compat.h index 6e8c09f..cd3d10f 100644 --- a/kregexpeditor/qt-only/compat.h +++ b/kregexpeditor/qt-only/compat.h @@ -20,7 +20,7 @@ #define COMPAT_H #include <tqobject.h> #include <tqmessagebox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <tqinputdialog.h> #include <tqframe.h> diff --git a/kregexpeditor/qtregexpconverter.cpp b/kregexpeditor/qtregexpconverter.cpp index c63550b..72f9290 100644 --- a/kregexpeditor/qtregexpconverter.cpp +++ b/kregexpeditor/qtregexpconverter.cpp @@ -48,14 +48,14 @@ TQString TQtRegExpConverter::toString( AltnRegExp* regexp, bool markSelection ) TQString res; bool first = true; - RegExpList list = regexp->children(); + RegExpList list = regexp->tqchildren(); for ( RegExpListIt it(list); *it; ++it ) { if ( !first ) { - res += TQString::fromLatin1( "|" ); + res += TQString::tqfromLatin1( "|" ); } first = false; if ( markSelection && !regexp->isSelected() && (*it)->isSelected() ) { - res += TQString::fromLatin1("(") + toStr( *it, markSelection ) + TQString::fromLatin1(")"); + res += TQString::tqfromLatin1("(") + toStr( *it, markSelection ) + TQString::tqfromLatin1(")"); } else { res += toStr( *it, markSelection ); @@ -69,7 +69,7 @@ TQString TQtRegExpConverter::toString( ConcRegExp* regexp, bool markSelection ) TQString res; bool childSelected = false; - RegExpList list = regexp->children(); + RegExpList list = regexp->tqchildren(); for ( RegExpListIt it(list); *it; ++it ) { TQString startPar = TQString::fromLocal8Bit(""); TQString endPar = TQString::fromLocal8Bit(""); @@ -77,25 +77,25 @@ TQString TQtRegExpConverter::toString( ConcRegExp* regexp, bool markSelection ) if ( markSelection ) startPar = TQString::fromLocal8Bit("(?:"); else - startPar = TQString::fromLatin1( "(" ); - endPar = TQString::fromLatin1( ")" ); + startPar = TQString::tqfromLatin1( "(" ); + endPar = TQString::tqfromLatin1( ")" ); } // 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::fromLatin1("("); + res += TQString::tqfromLatin1("("); childSelected = true; } if ( markSelection && childSelected && !regexp->isSelected() && !(*it)->isSelected() ) { - res += TQString::fromLatin1(")"); + res += TQString::tqfromLatin1(")"); childSelected= false; } res += startPar + toStr( *it, markSelection ) + endPar; } if ( markSelection && childSelected && !regexp->isSelected() ) { - res += TQString::fromLatin1(")"); + res += TQString::tqfromLatin1(")"); } 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::fromLatin1( "(?=" ) + toStr( regexp->child(), markSelection ) + TQString::fromLocal8Bit( ")" ); + return TQString::tqfromLatin1( "(?=" ) + toStr( regexp->child(), markSelection ) + TQString::fromLocal8Bit( ")" ); else - return TQString::fromLatin1( "(?!" ) + toStr( regexp->child(), markSelection ) + TQString::fromLocal8Bit( ")" ); + return TQString::tqfromLatin1( "(?!" ) + 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::fromLatin1("-")+ (*it)->second()); + txt.append((*it)->first()+ TQString::tqfromLatin1("-")+ (*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::fromLatin1("["); + TQString res = TQString::tqfromLatin1("["); if ( regexp->negate() ) - res.append(TQString::fromLatin1("^")); + res.append(TQString::tqfromLatin1("^")); // a ']' must be the first character in teh range. if ( foundParenthesis ) { - res.append(TQString::fromLatin1("]")); + res.append(TQString::tqfromLatin1("]")); } // a '-' must be the first character ( only coming after a ']') if ( foundDash ) { - res.append(TQString::fromLatin1("-")); + res.append(TQString::tqfromLatin1("-")); } res += txt; @@ -184,7 +184,7 @@ TQString TQtRegExpConverter::toString( TextRangeRegExp* regexp, bool /*markSelec res.append( TQChar( '^' ) ); } - res.append(TQString::fromLatin1("]")); + res.append(TQString::tqfromLatin1("]")); 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::fromLatin1( "(" ) + toStr( regexp->child(), markSelection ) + TQString::fromLatin1( ")" ); + return TQString::tqfromLatin1( "(" ) + toStr( regexp->child(), markSelection ) + TQString::tqfromLatin1( ")" ); else return toStr( regexp->child(), markSelection ); } TQString TQtRegExpConverter::toString( DotRegExp* /*regexp*/, bool /*markSelection*/ ) { - return TQString::fromLatin1( "." ); + return TQString::tqfromLatin1( "." ); } TQString TQtRegExpConverter::toString( PositionRegExp* regexp, bool /*markSelection*/ ) { switch (regexp->position()) { case PositionRegExp::BEGLINE: - return TQString::fromLatin1("^"); + return TQString::tqfromLatin1("^"); case PositionRegExp::ENDLINE: - return TQString::fromLatin1("$"); + return TQString::tqfromLatin1("$"); case PositionRegExp::WORDBOUNDARY: - return TQString::fromLatin1("\\b"); + return TQString::tqfromLatin1("\\b"); case PositionRegExp::NONWORDBOUNDARY: - return TQString::fromLatin1("\\B"); + return TQString::tqfromLatin1("\\B"); } Q_ASSERT( false ); - return TQString::fromLatin1(""); + return TQString::tqfromLatin1(""); } 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::fromLatin1( "(" ); - endPar = TQString::fromLatin1( ")" ); + startPar = TQString::tqfromLatin1( "(" ); + endPar = TQString::tqfromLatin1( ")" ); } else if ( child->precedence() < regexp->precedence() ) { - startPar = TQString::fromLatin1( "(?:" ); - endPar = TQString::fromLatin1( ")" ); + startPar = TQString::tqfromLatin1( "(?:" ); + endPar = TQString::tqfromLatin1( ")" ); } } else if ( child->precedence() < regexp->precedence() ) { - startPar = TQString::fromLatin1( "(" ); - endPar = TQString::fromLatin1( ")" ); + startPar = TQString::tqfromLatin1( "(" ); + endPar = TQString::tqfromLatin1( ")" ); } if ( regexp->min() == 0 && regexp->max() == -1) { @@ -285,7 +285,7 @@ TQString TQtRegExpConverter::toString( TextRegExp* regexp, bool /*markSelection* TQString TQtRegExpConverter::name() { - return TQString::fromLatin1( "TQt" ); + return TQString::tqfromLatin1( "TQt" ); } int TQtRegExpConverter::features() diff --git a/kregexpeditor/qtregexphighlighter.h b/kregexpeditor/qtregexphighlighter.h index 70ae5f0..8bf1c55 100644 --- a/kregexpeditor/qtregexphighlighter.h +++ b/kregexpeditor/qtregexphighlighter.h @@ -18,7 +18,7 @@ #ifndef TQTREGEXPHIGHLIGHTER_H #define TQTREGEXPHIGHLIGHTER_H #include "regexphighlighter.h" -#include <textedit.h> +#include <tqtextedit.h> class QtRegexpHighlighter :public RegexpHighlighter { diff --git a/kregexpeditor/regexp.cpp b/kregexpeditor/regexp.cpp index 0b583d7..cb94e84 100644 --- a/kregexpeditor/regexp.cpp +++ b/kregexpeditor/regexp.cpp @@ -28,7 +28,7 @@ RegExp::RegExp( bool selected ) : _parent(0), _destructing( false ), _selected( RegExp::~RegExp() { _destructing = true; - for ( TQPtrListIterator<RegExp> it(_children); *it; ++it ) { + for ( TQPtrListIterator<RegExp> it(_tqchildren); *it; ++it ) { delete *it; } if ( _parent ) @@ -38,14 +38,14 @@ RegExp::~RegExp() void RegExp::addChild( RegExp* child ) { - _children.append( child ); + _tqchildren.append( child ); child->setParent( this ); } void RegExp::removeChild( RegExp* child ) { if ( ! _destructing ) { - _children.remove( child ); + _tqchildren.remove( child ); } } @@ -68,7 +68,7 @@ RegExp* RegExp::readRegExp( TQDomElement top, const TQString& version ) TQString RegExp::toXmlString() const { TQDomDocument doc; - doc.setContent( TQString::fromLatin1( "<RegularExpression/>" ) ); + doc.setContent( TQString::tqfromLatin1( "<RegularExpression/>" ) ); TQDomNode top = doc.documentElement(); top.toElement().setAttribute(TQString::fromLocal8Bit("version"), KRegExpEditorGUI::version); diff --git a/kregexpeditor/regexp.h b/kregexpeditor/regexp.h index 5b2bcae..9e0b384 100644 --- a/kregexpeditor/regexp.h +++ b/kregexpeditor/regexp.h @@ -59,7 +59,7 @@ protected: private: RegExp() {} // disable - TQPtrList<RegExp> _children; + TQPtrList<RegExp> _tqchildren; RegExp* _parent; bool _destructing; bool _selected; diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp index cb8b7ae..abbfb38 100644 --- a/kregexpeditor/regexpbuttons.cpp +++ b/kregexpeditor/regexpbuttons.cpp @@ -30,14 +30,14 @@ #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqbuttongroup.h> -#include <layout.h> +#include <tqlayout.h> #include <tqsignalmapper.h> #include "regexpconverter.h" RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) : TQDockWindow( TQDockWindow::InDock, parent, name), _keepMode(false) { - TQBoxLayout *layout = boxLayout(); + TQBoxLayout *tqlayout = boxLayout(); _grp = new TQButtonGroup(this); _grp->hide(); @@ -53,11 +53,11 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) TQPixmap pix; pix.convertFromImage( qembed_findImage( "select" ) ); #else - TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/select.png") ), KIcon::Toolbar ); + TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::tqfromLatin1("kregexpeditor/pics/select.png") ), KIcon::Toolbar ); #endif _selectBut->setPixmap( pix ); - layout->addWidget( _selectBut ); + tqlayout->addWidget( _selectBut ); _grp->insert(_selectBut); _selectBut->setToggleButton( true ); connect( _selectBut, TQT_SIGNAL(clicked()), TQT_SIGNAL(doSelect())); @@ -76,19 +76,19 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) but = insert(TEXT, "text", i18n("Text"), i18n( "<qt>This will insert a text field, where you may write text. The text you write will " "be matched literally. (i.e. you do not need to escape any characters)</qt>" ) ); - layout->addWidget( but ); + tqlayout->addWidget( but ); but = insert(CHARSET, "characters", i18n("A single character specified in a range"), i18n("<qt>This will match a single character from a predefined range.<p>" "When you insert this widget a dialog box will appear, which lets you specify " "which characters this <i>regexp item</i> will match.</qt>") ); - layout->addWidget( but ); + tqlayout->addWidget( but ); but = insert(DOT, "anychar", i18n("Any character"), i18n("<qt>This will match any single character</qt>") ); - layout->addWidget( but ); + tqlayout->addWidget( but ); but = insert(REPEAT, "repeat", i18n("Repeated content"), @@ -102,14 +102,14 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) "is <tt>abc</tt>, then this <i>regexp item</i> will match the empty string, " "the string <tt>abc</tt>, the string <tt>abcabc</tt>, the string <tt>abcabcabcabc</tt>, " "etc.</qt>") ); - layout->addWidget( but ); + tqlayout->addWidget( but ); but = insert(ALTN, "altn", i18n("Alternatives"), i18n("<qt>This <i>regexp item</i> will match any of its alternatives.</p>" "You specify alternatives by placing <i>regexp items</i> on top of " "each other inside this widget.</qt>") ); - layout->addWidget( but ); + tqlayout->addWidget( but ); but = insert(COMPOUND, "compound", i18n("Compound regexp"), @@ -118,48 +118,48 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) "a small box. This makes it easier for you to get an overview of large " "<i>regexp items</i>. This is especially useful if you load a predefined <i>regexp item</i> " "you perhaps don't care about the inner workings of.") ); - layout->addWidget( but ); + tqlayout->addWidget( but ); but = insert(BEGLINE, "begline", i18n("Beginning of line"), i18n("<qt>This will match the beginning of a line.</qt>") ); - layout->addWidget( but ); + tqlayout->addWidget( but ); but = insert(ENDLINE, "endline", i18n("End of line"), i18n("<qt>This will match the end of a line.</qt>") ); - layout->addWidget( but ); + tqlayout->addWidget( but ); _wordBoundary = insert(WORDBOUNDARY, "wordboundary", i18n("Word boundary"), i18n("<qt>This asserts a word boundary (This part does not actually match any characters)</qt>") ); - layout->addWidget( _wordBoundary ); + tqlayout->addWidget( _wordBoundary ); _nonWordBoundary = insert(NONWORDBOUNDARY, "nonwordboundary", i18n("Non Word boundary"), i18n("<qt>This asserts a non-word boundary " "(This part does not actually match any characters)</qt>") ); - layout->addWidget( _nonWordBoundary ); + tqlayout->addWidget( _nonWordBoundary ); _posLookAhead = insert(POSLOOKAHEAD, "poslookahead", i18n("Positive Look Ahead"), i18n("<qt>This asserts a regular expression (This part does not actually match any characters). " "You can only use this at the end of a regular expression.</qt>") ); - layout->addWidget( _posLookAhead ); + tqlayout->addWidget( _posLookAhead ); _negLookAhead = insert(NEGLOOKAHEAD, "neglookahead", i18n("Negative Look Ahead"), i18n("<qt>This asserts a regular expression that must not match " "(This part does not actually match any characters). " "You can only use this at the end of a regular expression.</qt>") ); - layout->addWidget( _negLookAhead ); + tqlayout->addWidget( _negLookAhead ); } DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQString tooltip, TQString whatsthis) { #ifdef TQT_ONLY TQPixmap pix; - pix.convertFromImage( qembed_findImage( TQString::fromLatin1( name ) ) ); + pix.convertFromImage( qembed_findImage( TQString::tqfromLatin1( name ) ) ); #else - TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/")+TQString::fromLatin1(name) + - TQString::fromLatin1(".png") ), KIcon::Toolbar ); + TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::tqfromLatin1("kregexpeditor/pics/")+TQString::tqfromLatin1(name) + + TQString::tqfromLatin1(".png") ), KIcon::Toolbar ); #endif DoubleClickButton* but = new DoubleClickButton( pix, this, "RegExpButtons::but"); diff --git a/kregexpeditor/regexpconverter.cpp b/kregexpeditor/regexpconverter.cpp index 22373ce..951f0d7 100644 --- a/kregexpeditor/regexpconverter.cpp +++ b/kregexpeditor/regexpconverter.cpp @@ -27,7 +27,7 @@ #include "positionregexp.h" #include "repeatregexp.h" #include "textregexp.h" -#include <textedit.h> +#include <tqtextedit.h> #include "regexphighlighter.h" RegExpConverter* RegExpConverter::_current = 0; @@ -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::fromLatin1( "" ); + return TQString::tqfromLatin1( "" ); } diff --git a/kregexpeditor/regexpwidget.cpp b/kregexpeditor/regexpwidget.cpp index 231848f..c164c51 100644 --- a/kregexpeditor/regexpwidget.cpp +++ b/kregexpeditor/regexpwidget.cpp @@ -43,17 +43,17 @@ RegExpWidget::RegExpWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, void RegExpWidget::addNewChild(DragAccepter *, RegExpWidget *) { - qFatal("This widget should not expect any children"); + qFatal("This widget should not expect any tqchildren"); } void RegExpWidget::addNewConcChild(DragAccepter *, ConcWidget *) { - qFatal("This widget should not expect any children"); + qFatal("This widget should not expect any tqchildren"); } void RegExpWidget::setConcChild(ConcWidget *) { - qFatal("This widget should not expect any children"); + qFatal("This widget should not expect any tqchildren"); } bool RegExpWidget::updateSelection(bool parentSelected) @@ -65,7 +65,7 @@ bool RegExpWidget::updateSelection(bool parentSelected) if ( _isSelected != selected ) { // Selection state changed _isSelected = selected; - repaint(); + tqrepaint(); return true; } return false; @@ -164,10 +164,10 @@ TQRect RegExpWidget::selectionRect() const void RegExpWidget::enterEvent( TQEvent * ) { - updateCursorShape(); + updatetqCursorShape(); } -void RegExpWidget::updateCursorShape() +void RegExpWidget::updatetqCursorShape() { TQCursor cursor; @@ -191,7 +191,7 @@ void RegExpWidget::updateCursorShape() void RegExpWidget::updateCursorRecursively() { - updateCursorShape(); + updatetqCursorShape(); } diff --git a/kregexpeditor/regexpwidget.h b/kregexpeditor/regexpwidget.h index d9480e9..2fd455a 100644 --- a/kregexpeditor/regexpwidget.h +++ b/kregexpeditor/regexpwidget.h @@ -49,7 +49,7 @@ public: virtual void addNewChild(DragAccepter *accepter, RegExpWidget *child); /** - Inserts all the children of `child' into this widget in place of + Inserts all the tqchildren of `child' into this widget in place of `accepter'. This method only applies to container widgets (see @ref SingleContainerWidget, and @ref MultiContainerWidget). @@ -83,7 +83,7 @@ public: virtual bool isSelected() const; /** - Returns true if this widget or one of its children is selected. + Returns true if this widget or one of its tqchildren is selected. */ virtual bool hasSelection() const; @@ -93,7 +93,7 @@ public: Update selection information for this widget. @param parentSelected indicates whether the parent is selected. @return true if the selection state has changed for the widget since - the last time the widget was painted. `repaint' is invoked on the widget if + the last time the widget was painted. `tqrepaint' is invoked on the widget if selection state is changed, to ensure that selection is visible. */ virtual bool updateSelection(bool parentSelected); @@ -148,7 +148,7 @@ public: @li accept cursor for insert/paste @li reject cursor for insert/paste */ - void updateCursorShape(); + void updatetqCursorShape(); virtual void updateCursorRecursively(); diff --git a/kregexpeditor/repeatregexp.cpp b/kregexpeditor/repeatregexp.cpp index 92b5ac8..3a03e90 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>") - .arg(TQString::fromLatin1("lower")).arg(TQString::fromLatin1("Repeat")).arg(lower), + .tqarg(TQString::tqfromLatin1("lower")).tqarg(TQString::tqfromLatin1("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>") - .arg(TQString::fromLatin1("upper")).arg(TQString::fromLatin1("Repeat")).arg(upper), + .tqarg(TQString::tqfromLatin1("upper")).tqarg(TQString::tqfromLatin1("Repeat")).tqarg(upper), i18n("Error While Loading From XML File") ) ; _upper = -1; } diff --git a/kregexpeditor/repeatwidget.cpp b/kregexpeditor/repeatwidget.cpp index aca3dc7..86f87f9 100644 --- a/kregexpeditor/repeatwidget.cpp +++ b/kregexpeditor/repeatwidget.cpp @@ -30,7 +30,7 @@ #include <tqcursor.h> #include <tqspinbox.h> #include <tqradiobutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqgrid.h> #include <tqvbuttongroup.h> #include "kwidgetstreamer.h" @@ -85,13 +85,13 @@ void RepeatWidget::init() } -TQSize RepeatWidget::sizeHint() const +TQSize RepeatWidget::tqsizeHint() const { - // TODO: Merge with LookAheadWidget::sizeHint + // TODO: Merge with LookAheadWidget::tqsizeHint TQFontMetrics metrics = fontMetrics(); _textSize = metrics.size( 0, _content->text() ); - _childSize = _child->sizeHint(); + _childSize = _child->tqsizeHint(); 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::sizeHint() const void RepeatWidget::paintEvent( TQPaintEvent *e ) { // TODO: Merge with LookAheadWidget::paintEvent - TQSize mySize = sizeHint(); + TQSize mySize = tqsizeHint(); TQPainter painter(this); drawPossibleSelection( painter, mySize ); @@ -152,13 +152,13 @@ void RepeatWidget::slotConfigCanceled() TQDataStream stream( _backup, IO_ReadOnly ); KWidgetStreamer streamer; streamer.fromStream( stream, TQT_TQOBJECT(_content) ); - repaint(); + tqrepaint(); } int RepeatWidget::edit() { - _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->sizeHint().width()/2, - _configWindow->sizeHint().height()/2) ); + _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->tqsizeHint().width()/2, + _configWindow->tqsizeHint().height()/2) ); TQDataStream stream( _backup, IO_WriteOnly ); KWidgetStreamer streamer; streamer.toStream( TQT_TQOBJECT(_content), stream ); @@ -271,7 +271,7 @@ TQString RepeatRangeWindow::text() case ATMOST: return i18n("Repeated at Most 1 Time", "Repeated at Most %n Times", _mostTimes->value() ); case EXACTLY: return i18n("Repeated Exactly 1 Time", "Repeated Exactly %n Times", _exactlyTimes->value() ); case MINMAX: return i18n("Repeated From %1 to %2 Times") - .arg( _rangeFrom->value() ).arg( _rangeTo->value() ); + .tqarg( _rangeFrom->value() ).tqarg( _rangeTo->value() ); } qFatal("Fall through!"); return TQString::fromLocal8Bit(""); diff --git a/kregexpeditor/repeatwidget.h b/kregexpeditor/repeatwidget.h index 98ea6ee..8911461 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 sizeHint() const; + virtual TQSize tqsizeHint() 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 07e8bf0..b14261c 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->sizeHint(); + TQSize childSize = _editorWindow->tqsizeHint(); TQSize vpSize = _scrollView->viewportSize(10,10); bool change = false; diff --git a/kregexpeditor/selectablelineedit.cpp b/kregexpeditor/selectablelineedit.cpp index 0e085d5..ac42c83 100644 --- a/kregexpeditor/selectablelineedit.cpp +++ b/kregexpeditor/selectablelineedit.cpp @@ -33,23 +33,23 @@ SelectableLineEdit::SelectableLineEdit( RegExpWidget* owner, TQWidget* parent, c void SelectableLineEdit::setSelected( bool selected ) { if ( selected ) { - TQPalette pal = TQPalette(palette()); + TQPalette pal = TQPalette(tqpalette()); pal.setBrush( TQColorGroup::Base, gray ); setPalette( pal ); } else { unsetPalette(); } - repaint(); + tqrepaint(); } -TQSize SelectableLineEdit::sizeHint() const +TQSize SelectableLineEdit::tqsizeHint() const { int frameWidth = frame() ? 8 : 4; // from TQLineEdit source TQFontMetrics metrics = fontMetrics(); int actualSize = metrics.width( text() ); int charWidth = metrics.maxWidth(); - int height = TQLineEdit::sizeHint().height(); + int height = TQLineEdit::tqsizeHint().height(); int width; if ( hasFocus() ) @@ -67,7 +67,7 @@ void SelectableLineEdit::slotKeyPressed() int actualSize = metrics.width( text() ); if ( actualSize > size().width()-frameWidth ) { - repaint(); + tqrepaint(); emit parentPleaseUpdate(); } } diff --git a/kregexpeditor/selectablelineedit.h b/kregexpeditor/selectablelineedit.h index 79522b3..7fb7ad7 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 sizeHint() const; + virtual TQSize tqsizeHint() const; protected slots: void slotKeyPressed(); diff --git a/kregexpeditor/singlecontainerwidget.cpp b/kregexpeditor/singlecontainerwidget.cpp index 52ee1fe..2413236 100644 --- a/kregexpeditor/singlecontainerwidget.cpp +++ b/kregexpeditor/singlecontainerwidget.cpp @@ -33,7 +33,7 @@ bool SingleContainerWidget::updateSelection( bool parentSelected ) bool changed = RegExpWidget::updateSelection( parentSelected ); changed = _child->updateSelection( _isSelected ) && changed; if (changed) - repaint(); + tqrepaint(); return changed; } @@ -126,7 +126,7 @@ void SingleContainerWidget::updateAll() void SingleContainerWidget::updateCursorRecursively() { _child->updateCursorRecursively(); - updateCursorShape(); + updatetqCursorShape(); } diff --git a/kregexpeditor/test-without-dl/main.cpp b/kregexpeditor/test-without-dl/main.cpp index 0094b4a..76e2fbe 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::fromLatin1( "#include" ) ); + iface->setRegExp( TQString::tqfromLatin1( "#include" ) ); iface->doSomething( "setMinimal", (void*) false ); - iface->doSomething( "setSyntax", (void*) new TQString( TQString::fromLatin1( "Emacs" ) ) ); + iface->doSomething( "setSyntax", (void*) new TQString( TQString::tqfromLatin1( "Emacs" ) ) ); iface->doSomething( "setShowSyntaxCombo", (bool*) true ); TQFile file("/packages/kde-src/tdeutils/kregexpeditor/test/main.cpp"); diff --git a/kregexpeditor/textrangeregexp.cpp b/kregexpeditor/textrangeregexp.cpp index 0a92073..78c2696 100644 --- a/kregexpeditor/textrangeregexp.cpp +++ b/kregexpeditor/textrangeregexp.cpp @@ -127,7 +127,7 @@ bool TextRangeRegExp::load( TQDomElement top, const TQString& /*version*/ ) addRange( from, to ); } else { - KMessageBox::sorry( 0, i18n("<p>Invalid sub element to element <b>TextRange</b>. Tag was <b>%1</b></p>").arg(child.tagName()), + KMessageBox::sorry( 0, i18n("<p>Invalid sub element to element <b>TextRange</b>. Tag was <b>%1</b></p>").tqarg(child.tagName()), i18n("Error While Loading From XML File") ) ; return false; } diff --git a/kregexpeditor/textregexp.cpp b/kregexpeditor/textregexp.cpp index c31f9ac..d53d916 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::fromLatin1( "" ); + _text = TQString::tqfromLatin1( "" ); } return true; diff --git a/kregexpeditor/textwidget.cpp b/kregexpeditor/textwidget.cpp index d2f7549..99a77e1 100644 --- a/kregexpeditor/textwidget.cpp +++ b/kregexpeditor/textwidget.cpp @@ -22,7 +22,7 @@ #include "textwidget.h" #include "textregexp.h" #include "selectablelineedit.h" -#include <layout.h> +#include <tqlayout.h> TextWidget::TextWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) @@ -56,19 +56,19 @@ void TextWidget::init( const TQString& txt ) void TextWidget::slotUpdate() { - // I need to force the parent to repaint, as the size change of this + // I need to force the parent to tqrepaint, as the size change of this // widget may not be enough for the parent to change size, and in that - // case the parent would not repaint, and the text widget would not be + // case the parent would not tqrepaint, and the text widget would not be // resized. TQWidget *p = TQT_TQWIDGET(parent()); if (p) - p->repaint(); + p->tqrepaint(); _editorWindow->updateContent( this ); } -TQSize TextWidget::sizeHint() const +TQSize TextWidget::tqsizeHint() const { - return _edit->sizeHint(); + return _edit->tqsizeHint(); } void TextWidget::paintEvent( TQPaintEvent *e) diff --git a/kregexpeditor/textwidget.h b/kregexpeditor/textwidget.h index ac1c069..71ccf9b 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 sizeHint() const; + virtual TQSize tqsizeHint() 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 d1c63ee..85dc96e 100644 --- a/kregexpeditor/userdefinedregexps.cpp +++ b/kregexpeditor/userdefinedregexps.cpp @@ -32,7 +32,7 @@ #include <tqdir.h> #include "widgetfactory.h" #include "compoundregexp.h" -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> UserDefinedRegExps::UserDefinedRegExps( TQWidget *parent, const char *name ) @@ -68,7 +68,7 @@ void UserDefinedRegExps::slotPopulateUserRegexps() #ifdef TQT_ONLY TQStringList dirs; - dirs << TQString::fromLatin1( "predefined" ); + dirs << TQString::tqfromLatin1( "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::fromLatin1("general")) + if (_title == TQString::tqfromLatin1("general")) title = i18n("General"); TQListViewItem* lvItem = new TQListViewItem( _userDefined, title ); @@ -101,7 +101,7 @@ void UserDefinedRegExps::createItems( const TQString& _title, const TQString& di TQFile file( fileName ); if ( ! file.open(IO_ReadOnly) ) { - KMessageBox::sorry( this, i18n("Could not open file for reading: %1").arg(fileName) ); + KMessageBox::sorry( this, i18n("Could not open file for reading: %1").tqarg(fileName) ); continue; } @@ -111,7 +111,7 @@ void UserDefinedRegExps::createItems( const TQString& _title, const TQString& di RegExp* regexp = WidgetFactory::createRegExp( data ); if ( ! regexp ) { - KMessageBox::sorry( this, i18n("File %1 containing user defined regular expression contained an error").arg( fileName ) ); + KMessageBox::sorry( this, i18n("File %1 containing user defined regular expression contained an error").tqarg( fileName ) ); continue; } @@ -200,7 +200,7 @@ void UserDefinedRegExps::slotEdit( TQListViewItem* item, const TQPoint& pos ) TQString fileName = WidgetWinItem::path() + TQString::fromLocal8Bit("/") + txt + TQString::fromLocal8Bit(".regexp"); TQFileInfo finfo( fileName ); if ( finfo.exists() ) { - int answer = KMessageBox::warningYesNo( this, i18n("<p>Overwrite named regular expression <b>%1</b>?</p>").arg(txt), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ); + int answer = KMessageBox::warningYesNo( this, i18n("<p>Overwrite named regular expression <b>%1</b>?</p>").tqarg(txt), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") ); if ( answer != KMessageBox::Yes ) return; @@ -256,7 +256,7 @@ void WidgetWinItem::setName( const TQString& nm ) TQString WidgetWinItem::path() { #ifdef TQT_ONLY - return TQString::fromLatin1( "predefined" ); + return TQString::tqfromLatin1( "predefined" ); #else return locateLocal("data", TQString::fromLocal8Bit("KRegExpEditor/")); #endif diff --git a/kregexpeditor/util.cpp b/kregexpeditor/util.cpp index a57f99c..b6cf4c6 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::fromLatin1("kregexpeditor/pics/") +name ), + return KGlobal::iconLoader()->loadIcon(locate("data", TQString::tqfromLatin1("kregexpeditor/pics/") +name ), KIcon::Toolbar ); #endif } diff --git a/kregexpeditor/verifier.cpp b/kregexpeditor/verifier.cpp index 23198be..18e1be3 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::fromLatin1("match%1").arg(which); +// TQString anchor = TQString::tqfromLatin1("match%1").tqarg(which); // scrollToAnchor( anchor ); // _current = which; // emit currentChanged( _current ); diff --git a/kregexpeditor/verifier.h b/kregexpeditor/verifier.h index 951c217..d1999d6 100644 --- a/kregexpeditor/verifier.h +++ b/kregexpeditor/verifier.h @@ -17,7 +17,7 @@ **/ #ifndef VERIFIER_H #define VERIFIER_H -#include <textedit.h> +#include <tqtextedit.h> #include "regexphighlighter.h" class TQTimer; class TQProgressDialog; diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp index 366130c..675d3e6 100644 --- a/kregexpeditor/verifybuttons.cpp +++ b/kregexpeditor/verifybuttons.cpp @@ -30,7 +30,7 @@ #include "verifybuttons.h" #include <tqtooltip.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwhatsthis.h> #include "qtregexpconverter.h" #include "emacsregexpconverter.h" @@ -42,56 +42,56 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name ) :TQDockWindow( TQDockWindow::InDock, parent, name ), _configMenu( 0 ) { - TQBoxLayout* layout = boxLayout(); + TQBoxLayout* tqlayout = boxLayout(); _verify = new TQToolButton(this); - TQIconSet icon = Util::getSystemIconSet( TQString::fromLatin1("spellcheck")); + TQIconSet icon = Util::getSystemIconSet( TQString::tqfromLatin1("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>." "(The window below the graphical editor window).")); - layout->addWidget( _verify ); + tqlayout->addWidget( _verify ); connect( _verify, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( verify() ) ); TQToolButton* button = new TQToolButton(this); - button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("fileopen")) ); - layout->addWidget( button ); + button->setPixmap( Util::getSystemIcon( TQString::tqfromLatin1("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::fromLatin1("package_settings")) ); - layout->addWidget( button ); + button->setPixmap( Util::getSystemIcon( TQString::tqfromLatin1("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::fromLatin1("<<"), this); - // layout->addWidget( _first ); + // _first = new TQToolButton( TQString::tqfromLatin1("<<"), this); + // tqlayout->addWidget( _first ); // connect(_first, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoFirst())); // _first->setFixedWidth( 25 ); // - // _prev = new TQToolButton(TQString::fromLatin1("<"), this); - // layout->addWidget( _prev ); + // _prev = new TQToolButton(TQString::tqfromLatin1("<"), this); + // tqlayout->addWidget( _prev ); // connect(_prev, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoPrev())); // _prev->setFixedWidth( 20 ); // - // _next = new TQToolButton(TQString::fromLatin1(">"), this); - // layout->addWidget( _next ); + // _next = new TQToolButton(TQString::tqfromLatin1(">"), this); + // tqlayout->addWidget( _next ); // connect(_next, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoNext())); // _next->setFixedWidth( 20 ); // - // _last = new TQToolButton(TQString::fromLatin1(">>"), this); - // layout->addWidget( _last ); + // _last = new TQToolButton(TQString::tqfromLatin1(">>"), this); + // tqlayout->addWidget( _last ); // connect(_last, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoLast())); // _last->setFixedWidth( 25 ); // Same as above // TQLabel* label = new TQLabel( i18n("Matches: "), this ); -// layout->addWidget( label ); +// tqlayout->addWidget( label ); // _matches = new TQLabel(i18n("-"), this ); -// layout->addWidget( _matches ); +// tqlayout->addWidget( _matches ); // TQString txt = i18n( "Shows number of times regular expression matches the text in the verifier window"); // TQToolTip::add( label, txt ); // TQToolTip::add( _matches, txt ); @@ -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::fromLatin1("-") ); + _matches->setText( TQString::tqfromLatin1("-") ); else _matches->setText( TQString::number( count ) ); */ diff --git a/kregexpeditor/widgetfactory.cpp b/kregexpeditor/widgetfactory.cpp index 1ab5d24..9f167b2 100644 --- a/kregexpeditor/widgetfactory.cpp +++ b/kregexpeditor/widgetfactory.cpp @@ -162,7 +162,7 @@ RegExp* WidgetFactory::createRegExp( TQDomElement node, const TQString& version else if ( tag == TQString::fromLocal8Bit( "Repeat" ) ) regexp = new RepeatRegExp( false ); else { - KMessageBox::sorry( 0, i18n("<p>Unknown tag while reading XML. Tag was <b>%1</b></p>").arg(tag), + KMessageBox::sorry( 0, i18n("<p>Unknown tag while reading XML. Tag was <b>%1</b></p>").tqarg(tag), i18n("Error While Loading From XML File") ) ; return 0; @@ -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>").arg(TQString::fromLatin1("RegularExpression")), + KMessageBox::sorry( 0, i18n("<p>XML file did not contain a <b>%1</b> tag.</p>").tqarg(TQString::tqfromLatin1("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>").arg(TQString::fromLatin1("RegularExpression")), + "<b>%1</b> was not an element.</p>").tqarg(TQString::tqfromLatin1("RegularExpression")), i18n("Error While Loading From XML File") ) ; } diff --git a/kregexpeditor/zerowidgets.cpp b/kregexpeditor/zerowidgets.cpp index 7c1f6c6..eaf1aaf 100644 --- a/kregexpeditor/zerowidgets.cpp +++ b/kregexpeditor/zerowidgets.cpp @@ -39,10 +39,10 @@ ZeroWidget::ZeroWidget(TQString txt, RegExpEditorWindow* editorWindow, void ZeroWidget::addNewChild(DragAccepter *, RegExpWidget *) { - qFatal("No children should be added to this widget!"); + qFatal("No tqchildren should be added to this widget!"); } -TQSize ZeroWidget::sizeHint() const +TQSize ZeroWidget::tqsizeHint() const { TQFontMetrics metrics = fontMetrics(); _textSize = HackCalculateFontSize( metrics, _text ); @@ -54,7 +54,7 @@ TQSize ZeroWidget::sizeHint() const void ZeroWidget::paintEvent( TQPaintEvent *e) { // So what is my Size? - TQSize mySize = sizeHint(); + TQSize mySize = tqsizeHint(); TQPainter painter(this); drawPossibleSelection( painter, mySize); diff --git a/kregexpeditor/zerowidgets.h b/kregexpeditor/zerowidgets.h index 04dd5c7..780f426 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 sizeHint() const; + virtual TQSize tqsizeHint() const; protected: virtual void paintEvent( TQPaintEvent *e ); diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp index 15f427d..3727b1f 100644 --- a/ksim/generalprefs.cpp +++ b/ksim/generalprefs.cpp @@ -27,7 +27,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqtabwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqpopupmenu.h> @@ -50,7 +50,7 @@ KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name) m_sizeBox->setTitle(i18n("Graph Size")); m_sizeBox->setColumnLayout(0, Qt::Horizontal); - TQGridLayout *sizeBoxLayout = new TQGridLayout(m_sizeBox->layout()); + TQGridLayout *sizeBoxLayout = new TQGridLayout(m_sizeBox->tqlayout()); sizeBoxLayout->setSpacing(6); m_sizeHLabel = new TQLabel(m_sizeBox); @@ -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->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + m_sizeHSpin->tqsetSizePolicy(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->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + m_sizeWSpin->tqsetSizePolicy(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->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + m_uptimeCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); m_uptimeCombo->insertItem(i18n("%hh:%mm:%ss")); m_uptimeCombo->insertItem(i18n("%dd %h:%m")); @@ -211,10 +211,10 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name) m_uptimeBox = new TQGroupBox(this); m_uptimeBox->setTitle(i18n("Uptime Legend")); m_uptimeBox->setColumnLayout(0, Qt::Vertical); - m_uptimeBox->layout()->setSpacing(0); - m_uptimeBox->layout()->setMargin(0); - m_boxLayout = new TQVBoxLayout(m_uptimeBox->layout()); - m_boxLayout->setAlignment(TQt::AlignTop); + m_uptimeBox->tqlayout()->setSpacing(0); + m_uptimeBox->tqlayout()->setMargin(0); + m_boxLayout = new TQVBoxLayout(m_uptimeBox->tqlayout()); + m_boxLayout->tqsetAlignment(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->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + m_memCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); //m_memCombo->insertItem(i18n("%tM - %fM free")); //m_memCombo->insertItem(i18n("%tM - %uM used")); @@ -347,10 +347,10 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name) m_memBox = new TQGroupBox(this); m_memBox->setTitle(i18n("Memory Legend")); m_memBox->setColumnLayout(0, Qt::Vertical); - m_memBox->layout()->setSpacing(0); - m_memBox->layout()->setMargin(0); - m_boxLayout = new TQVBoxLayout(m_memBox->layout()); - m_boxLayout->setAlignment(TQt::AlignTop); + m_memBox->tqlayout()->setSpacing(0); + m_memBox->tqlayout()->setMargin(0); + m_boxLayout = new TQVBoxLayout(m_memBox->tqlayout()); + m_boxLayout->tqsetAlignment(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->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + m_swapCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); //m_swapCombo->insertItem(i18n("%tM - %fM free")); //m_swapCombo->insertItem(i18n("%tM - %uM used")); @@ -496,10 +496,10 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name) m_swapBox = new TQGroupBox(this); m_swapBox->setTitle(i18n("Swap Legend")); m_swapBox->setColumnLayout(0, Qt::Vertical); - m_swapBox->layout()->setSpacing(0); - m_swapBox->layout()->setMargin(0); - m_boxLayout = new TQVBoxLayout(m_swapBox->layout()); - m_boxLayout->setAlignment(TQt::AlignTop); + m_swapBox->tqlayout()->setSpacing(0); + m_swapBox->tqlayout()->setMargin(0); + m_boxLayout = new TQVBoxLayout(m_swapBox->tqlayout()); + m_boxLayout->tqsetAlignment(TQt::AlignTop); m_boxLayout->setSpacing(6); m_boxLayout->setMargin(11); diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp index 396a772..2e2587e 100644 --- a/ksim/ksim.cpp +++ b/ksim/ksim.cpp @@ -23,7 +23,7 @@ #include <ksimconfig.h> #include <common.h> -#include <layout.h> +#include <tqlayout.h> #include <kaboutapplication.h> #include <kbugreport.h> @@ -75,9 +75,9 @@ KSim::PanelExtension::~PanelExtension() delete m_dcopClient; } -TQSize KSim::PanelExtension::sizeHint(Position p, TQSize maxSize) const +TQSize KSim::PanelExtension::tqsizeHint(Position p, TQSize maxSize) const { - return m_view->sizeHint(p, maxSize); + return m_view->tqsizeHint(p, maxSize); } void KSim::PanelExtension::resizeEvent(TQResizeEvent *) diff --git a/ksim/ksim.h b/ksim/ksim.h index 5451b83..2c1a4f5 100644 --- a/ksim/ksim.h +++ b/ksim/ksim.h @@ -42,7 +42,7 @@ namespace KSim ~PanelExtension(); - TQSize sizeHint( Position, TQSize maxSize ) const; + TQSize tqsizeHint( Position, TQSize maxSize ) const; void resizeEvent(TQResizeEvent *); Position preferedPosition() const; diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp index 66d2ef3..e5bb44a 100644 --- a/ksim/ksimpref.cpp +++ b/ksim/ksimpref.cpp @@ -122,7 +122,7 @@ void KSim::ConfigDialog::removePage(const TQCString &name) const KSim::Plugin &plugin = KSim::PluginLoader::self().find(name); if (plugin.isNull() || !plugin.configPage()) { KMessageBox::sorry(0, i18n("Failed to remove %1's config page due to the " - "plugin not being loaded or the config page has not been created").arg(name.data())); + "plugin not being loaded or the config page has not been created").tqarg(name.data())); return; } @@ -148,7 +148,7 @@ void KSim::ConfigDialog::createPage(const KSim::Plugin &plugin) if (plugin.isNull() || !plugin.configPage()) { KMessageBox::sorry(0, i18n("Failed to add %1's config page due to the plugin" " not being loaded or the config page has not been created") - .arg(plugin.libName().data())); + .tqarg(plugin.libName().data())); return; } @@ -156,7 +156,7 @@ void KSim::ConfigDialog::createPage(const KSim::Plugin &plugin) TQStringList list; list << ' ' + i18n("Plugins") << ' ' + plugin.name(); - TQFrame *pluginFrame = addHBoxPage(list, i18n("%1 Options").arg(plugin.name()), + TQFrame *pluginFrame = addHBoxPage(list, i18n("%1 Options").tqarg(plugin.name()), plugin.icon()); plugin.configPage()->reparent(pluginFrame, TQPoint(0, 0), true); diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp index 2e3d860..6813aeb 100644 --- a/ksim/ksimsysinfo.cpp +++ b/ksim/ksimsysinfo.cpp @@ -18,10 +18,10 @@ */ #include <tqtooltip.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <tqregexp.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqdatetime.h> #include <kdebug.h> @@ -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::currentDate())); + m_dateLabel->setText(KGlobal::locale()->formatDate(TQDate::tqcurrentDate())); updateDate = false; } } @@ -173,7 +173,7 @@ void KSim::Sysinfo::sysUpdate() } // if (m_config->showProcs()) { -// m_procsLabel->setText(i18n("Procs: %1").arg(sysInfo.procs)); +// m_procsLabel->setText(i18n("Procs: %1").tqarg(sysInfo.procs)); // } } @@ -274,7 +274,7 @@ void KSim::Sysinfo::createView() m_procsLabel = 0L; }*/ -// m_layout->invalidate(); +// m_layout->tqinvalidate(); updateGeometry(); adjustSize(); diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp index fc8e2cd..1e93816 100644 --- a/ksim/ksimview.cpp +++ b/ksim/ksimview.cpp @@ -49,7 +49,7 @@ #include <tqfile.h> #include <tqbitmap.h> #include <tqtimer.h> -#include <layout.h> +#include <tqlayout.h> #include <tqobjectlist.h> #include <tqpainter.h> #include <tqcursor.h> @@ -183,8 +183,8 @@ KSim::Config *KSim::MainView::config() const void KSim::MainView::makeDirs() { TQString homeDir = locateLocal("data", "ksim"); - TQString themeDir = homeDir + TQString::fromLatin1("/themes"); - TQString monitorDir = homeDir + TQString::fromLatin1("/monitors"); + TQString themeDir = homeDir + TQString::tqfromLatin1("/themes"); + TQString monitorDir = homeDir + TQString::tqfromLatin1("/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()) { - topLevelWidget()->clearMask(); + tqtopLevelWidget()->clearMask(); return; } @@ -226,16 +226,16 @@ void KSim::MainView::maskMainView() TQBitmap rightPixmap(*m_rightFrame->background()->mask()); TQBitmap bottomPixmap(*m_bottomFrame->background()->mask()); - TQSize insideSize(m_pluginLayout->geometry().size()); + TQSize insideSize(m_pluginLayout->tqgeometry().size()); // make a cleared bigrect where we can put our pixmap masks on - TQBitmap bigBitmap(topLevelWidget()->size(), true); + TQBitmap bigBitmap(tqtopLevelWidget()->size(), true); // better return if our bitmap is null so we can avoid crashes if (bigBitmap.isNull()) return; - TQPoint ofs = mapTo(topLevelWidget(), TQPoint(0,0)); + TQPoint ofs = mapTo(tqtopLevelWidget(), TQPoint(0,0)); int ofsX = ofs.x(); int ofsY = ofs.y(); @@ -243,7 +243,7 @@ void KSim::MainView::maskMainView() painter.begin(&bigBitmap); painter.setBrush(color1); painter.setPen(color1); - TQRect rect = m_pluginLayout->geometry(); + TQRect rect = m_pluginLayout->tqgeometry(); rect.moveBy(ofsX, ofsY); painter.drawRect(rect); painter.drawPixmap(ofsX, ofsY, topPixmap); @@ -254,7 +254,7 @@ void KSim::MainView::maskMainView() bottomPixmap); painter.end(); - topLevelWidget()->setMask(bigBitmap); + tqtopLevelWidget()->setMask(bigBitmap); } void KSim::MainView::reparseConfig(bool emitReload, @@ -430,7 +430,7 @@ void KSim::MainView::destroyPref() } } -TQSize KSim::MainView::sizeHint(KPanelExtension::Position p, TQSize) const +TQSize KSim::MainView::tqsizeHint(KPanelExtension::Position p, TQSize) const { int width = 0; int height = 0; @@ -439,7 +439,7 @@ TQSize KSim::MainView::sizeHint(KPanelExtension::Position p, TQSize) const for( TQLayoutIterator it = m_pluginLayout->iterator(); (child = it.current()) != 0; ++it) { - TQSize sz = child->minimumSize(); + TQSize sz = child->tqminimumSize(); if ((p == KPanelExtension::Right) || (p == KPanelExtension::Left)) { width = TQMAX(width, sz.width()); diff --git a/ksim/ksimview.h b/ksim/ksimview.h index 6bbb989..7aaacf1 100644 --- a/ksim/ksimview.h +++ b/ksim/ksimview.h @@ -63,7 +63,7 @@ namespace KSim KSim::Config *config() const; void makeDirs(); - TQSize sizeHint(KPanelExtension::Position, TQSize maxSize) const; + TQSize tqsizeHint(KPanelExtension::Position, TQSize maxSize) const; void positionChange(Qt::Orientation); k_dcop: diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp index b9b5e31..ca555a4 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 = sizeHint(); + TQSize oldSize = tqsizeHint(); KSim::Config::config()->setGroup("Misc"); d->size = KSim::Config::config()->readSizeEntry("GraphSize"); @@ -263,11 +263,11 @@ void KSim::Chart::configureObject(bool repaintWidget) d->krell->show(); } - // Update our geometry if we need to let any - // layout know about our sizeHint() change - if (oldSize != sizeHint()) { + // Update our tqgeometry if we need to let any + // tqlayout know about our tqsizeHint() change + if (oldSize != tqsizeHint()) { // Using resize() here seems to be needed - resize(sizeHint()); + resize(tqsizeHint()); updateGeometry(); } @@ -279,14 +279,14 @@ void KSim::Chart::configureObject(bool repaintWidget) update(); } -TQSize KSim::Chart::sizeHint() const +TQSize KSim::Chart::tqsizeHint() const { return d->size; } -TQSize KSim::Chart::minimumSizeHint() const +TQSize KSim::Chart::tqminimumSizeHint() const { - return sizeHint(); + return tqsizeHint(); } void KSim::Chart::resizeEvent(TQResizeEvent *re) @@ -333,19 +333,19 @@ void KSim::Chart::setDisplayMeter(bool value) void KSim::Chart::setText(const TQString &in, const TQString &out) { - bool repaint = false; + bool tqrepaint = false; if (d->inText != in) { - repaint = true; + tqrepaint = true; d->inText = in; } if (d->outText != out) { - repaint = true; + tqrepaint = true; d->outText = out; } - if (repaint) + if (tqrepaint) update(); } @@ -407,13 +407,13 @@ void KSim::Chart::setValue(int valueIn, int valueOut) void KSim::Chart::setConfigValues() { TQFont newFont = font(); - bool repaint = themeLoader().current().fontColours(this, + bool tqrepaint = themeLoader().current().fontColours(this, newFont, d->mColour, d->sColour, d->showShadow); if (font() != newFont) setFont(newFont); - if (repaint) + if (tqrepaint) update(); } @@ -446,7 +446,7 @@ void KSim::Chart::paintEvent(TQPaintEvent *) const TQSize &size = chartSize(); TQPixmap pixmap(size); TQPainter painter; - painter.begin(&pixmap, this); + painter.tqbegin(&pixmap, this); int location = size.height() / 5; painter.drawPixmap(0, 0, d->chartPixmap); @@ -521,7 +521,7 @@ void KSim::Chart::drawChart() TQPainter painter; d->graphData.setMask(drawMask(&painter)); - painter.begin(&d->graphData, this); + painter.tqbegin(&d->graphData, this); int position = width() - 1; TQValueList<Private::ValuePair>::ConstIterator it; @@ -553,7 +553,7 @@ TQSize KSim::Chart::chartSize() const TQBitmap KSim::Chart::drawMask(TQPainter *painter) { TQBitmap bitmap(chartSize(), true); - painter->begin(&bitmap, this); + painter->tqbegin(&bitmap, this); painter->setPen(color1); int position = width() - 1; @@ -608,7 +608,7 @@ void KSim::Chart::init(bool krell, int maxValue, const TQString &title) { setConfigString("StyleChart"); setThemeConfigOnly(false); - setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + tqsetSizePolicy(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 6f8cfeb..cd658c0 100644 --- a/ksim/library/chart.h +++ b/ksim/library/chart.h @@ -109,11 +109,11 @@ namespace KSim /** * reimplemented for internal reasons */ - TQSize sizeHint() const; + TQSize tqsizeHint() const; /** * reimplemented for internal reasons */ - TQSize minimumSizeHint() const; + TQSize tqminimumSizeHint() const; void disableAutomaticUpdates(); diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp index 16be059..0b9ed18 100644 --- a/ksim/library/label.cpp +++ b/ksim/library/label.cpp @@ -24,7 +24,7 @@ #include <tqpainter.h> #include <tqstyle.h> -#include <stylesheet.h> +#include <tqstylesheet.h> #include <tqsimplerichtext.h> #include <tqcursor.h> #include <tqpixmap.h> @@ -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 = sizeHint(); + TQSize oldSize = tqsizeHint(); setConfigValues(); relayoutLabel(oldSize, repaintWidget); @@ -99,7 +99,7 @@ void KSim::Label::setPixmap(const TQPixmap &pixmap) if (pixmap.serialNumber() == d->sidePixmap.serialNumber()) return; - TQSize oldSize = sizeHint(); + TQSize oldSize = tqsizeHint(); d->sidePixmap = pixmap; relayoutLabel(oldSize); @@ -110,7 +110,7 @@ const TQPixmap &KSim::Label::pixmap() const return d->sidePixmap; } -TQSize KSim::Label::sizeHint() const +TQSize KSim::Label::tqsizeHint() const { int width = fontMetrics().size(SingleLine, text()).width(); if (!pixmap().isNull()) @@ -123,9 +123,9 @@ TQSize KSim::Label::sizeHint() const return TQSize(width, height); } -TQSize KSim::Label::minimumSizeHint() const +TQSize KSim::Label::tqminimumSizeHint() const { - return sizeHint(); + return tqsizeHint(); } void KSim::Label::clear() @@ -136,10 +136,10 @@ void KSim::Label::clear() void KSim::Label::setText(const TQString &text) { if (text == d->text) - return; // If the text is the same, no need to repaint etc + return; // If the text is the same, no need to tqrepaint etc - TQSize oldSize = sizeHint(); - // set the text of our widget and repaint + TQSize oldSize = tqsizeHint(); + // set the text of our widget and tqrepaint d->text = text; relayoutLabel(oldSize); } @@ -183,13 +183,13 @@ const TQColor &KSim::Label::shadowColour() const void KSim::Label::setConfigValues() { TQFont newFont = font(); - bool repaint = themeLoader().current().fontColours(this, + bool tqrepaint = themeLoader().current().fontColours(this, newFont, d->mColour, d->sColour, d->showShadow); if (font() != newFont) setFont(newFont); - if (repaint) + if (tqrepaint) update(); } @@ -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, colorGroup(), true, + tqstyle().drawItem(painter, location, AlignCenter, tqcolorGroup(), 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, colorGroup(), true, + tqstyle().drawItem(painter, location, AlignCenter, tqcolorGroup(), 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 = sizeHint(); + TQSize oldSize = tqsizeHint(); d->meterImage.reset(); d->meterImage.load(image); KSim::ThemeLoader::self().reColourImage(d->meterImage); @@ -276,13 +276,13 @@ void KSim::Label::setThemePixmap(const TQString &image) relayoutLabel(oldSize); } -void KSim::Label::relayoutLabel(const TQSize &old, bool repaint) +void KSim::Label::relayoutLabel(const TQSize &old, bool tqrepaint) { - if (sizeHint() != old) { + if (tqsizeHint() != old) { updateGeometry(); } - if (repaint) + if (tqrepaint) update(); } @@ -294,7 +294,7 @@ void KSim::Label::initWidget(int type) // try to reduce flicker as much as possible setBackgroundMode(NoBackground); - setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); configureObject(); diff --git a/ksim/library/label.h b/ksim/library/label.h index 9e24c95..f20d8df 100644 --- a/ksim/library/label.h +++ b/ksim/library/label.h @@ -108,11 +108,11 @@ namespace KSim /** * reimplemented for internal reasons */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** * reimplemented for internal reasons */ - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; public slots: /** @@ -196,7 +196,7 @@ namespace KSim * sets the background image to be painted */ void setThemePixmap(const TQString &image); - void relayoutLabel(const TQSize &old, bool repaint = true); + void relayoutLabel(const TQSize &old, bool tqrepaint = true); private: /** diff --git a/ksim/library/led.cpp b/ksim/library/led.cpp index a20a1d1..3fa8d7f 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::sizeHint() const +TQSize KSim::LedLabel::tqsizeHint() const { - TQSize hint(Progress::sizeHint()); + TQSize hint(Progress::tqsizeHint()); if (d->sendLed.height() > hint.height()) hint.setHeight(d->sendLed.height()); diff --git a/ksim/library/led.h b/ksim/library/led.h index 6dcecce..5c5e615 100644 --- a/ksim/library/led.h +++ b/ksim/library/led.h @@ -88,7 +88,7 @@ namespace KSim */ Type type() const; /** - * Force the Led to repaint its state + * Force the Led to tqrepaint its state */ void update(); @@ -150,7 +150,7 @@ namespace KSim /** * reimplemented for internal reasons */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: /** diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp index 71b17b7..775a02e 100644 --- a/ksim/library/pluginloader.cpp +++ b/ksim/library/pluginloader.cpp @@ -92,13 +92,13 @@ bool KSim::PluginLoader::loadPlugin(const KDesktopFile &file) case KSim::PluginLoader::EmptyLibName: KMessageBox::error(0, i18n("KSim was unable to load the plugin %1" " due to the X-KSIM-LIBRARY property being empty in the" - " plugins desktop file").arg(file.readName())); + " plugins desktop file").tqarg(file.readName())); return false; break; case KSim::PluginLoader::LibNotFound: KMessageBox::error(0, i18n("KSim was unable to load the plugin %1" " due to not being able to find the plugin, check that the plugin" - " is installed and is in your $TDEDIR/lib path").arg(file.readName())); + " is installed and is in your $TDEDIR/lib path").tqarg(file.readName())); return false; break; case KSim::PluginLoader::UnSymbols: @@ -108,8 +108,8 @@ bool KSim::PluginLoader::loadPlugin(const KDesktopFile &file) " macro</li>\n<li>The plugin has been damaged or has" " some unresolved symbols</li>\n</ul> \nLast" " error message that occurred: \n%3</qt>") - .arg(d->lib.prepend("ksim_")).arg("KSIM_INIT_PLUGIN") - .arg(d->error)); + .tqarg(d->lib.prepend("ksim_")).tqarg("KSIM_INIT_PLUGIN") + .tqarg(d->error)); return false; break; default: diff --git a/ksim/library/progress.cpp b/ksim/library/progress.cpp index 82ae16e..e37cff1 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::sizeHint() const +TQSize KSim::Progress::tqsizeHint() const { - TQSize hint(Label::sizeHint()); + TQSize hint(Label::tqsizeHint()); 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 = sizeHint(); + TQSize oldSize = tqsizeHint(); d->meterPixmap = pixmap; relayoutLabel(oldSize); } diff --git a/ksim/library/progress.h b/ksim/library/progress.h index 415c9fa..0e30986 100644 --- a/ksim/library/progress.h +++ b/ksim/library/progress.h @@ -122,7 +122,7 @@ namespace KSim /** * reimplemented for internal reasons */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; public slots: /** diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp index f6d6474..3fced29 100644 --- a/ksim/library/themeloader.cpp +++ b/ksim/library/themeloader.cpp @@ -217,7 +217,7 @@ TQRect KSim::Theme::frameRightBorder(const TQRect &defValue) const TQColor KSim::Theme::chartInColour(const TQColor &defValue) const { if (d->recolour) - return TQApplication::palette().active().background(); + return TQApplication::tqpalette().active().background(); return internalColourEntry("chart_in_color", defValue); } @@ -230,7 +230,7 @@ TQColor KSim::Theme::chartInColourGrid(const TQColor &defValue) const TQColor KSim::Theme::chartOutColour(const TQColor &defValue) const { if (d->recolour) - return TQApplication::palette().active().background(); + return TQApplication::tqpalette().active().background(); return internalColourEntry("chart_out_color", defValue); } @@ -691,7 +691,7 @@ TQString KSim::Theme::readColourEntry(const TQString &itemType, { TQString color = readEntry(itemType, entry); if (color.isEmpty()) - color = TQString::fromLatin1("#ffffff #ffffff"); + color = TQString::tqfromLatin1("#ffffff #ffffff"); return TQStringList::split(' ', color)[row]; } @@ -718,14 +718,14 @@ bool KSim::Theme::fontColours(int type, const TQString &string, TQFont &font, TQColor &text, TQColor &shadow, bool &showShadow) const { TQString key = KSim::Types::typeToString(type, false); - bool repaint = false; + bool tqrepaint = false; // set colours from the string 'key' if (!readEntry(string, key + ".textcolor").isEmpty()) { text= textColour(string, key + ".textcolor"); shadow = shadowColour(string, key + ".textcolor"); showShadow = textShadow(string, key + ".textcolor"); - repaint = true; + tqrepaint = true; } else { text= textColour(string, "*.textcolor"); @@ -737,14 +737,14 @@ bool KSim::Theme::fontColours(int type, const TQString &string, TQFont &font, if (!readEntry(string, key + ".font").isEmpty()) { if (KSim::ThemeLoader::currentFontItem() != 3) { font = readFontEntry(string, key + ".font"); - repaint = true; + tqrepaint = true; } } else { font = currentFont(); } - return repaint; + return tqrepaint; } bool KSim::Theme::fontColours(const KSim::Base *const base, TQFont &font, @@ -927,7 +927,7 @@ void KSim::ThemeLoader::reload() if (m_theme.d) m_theme.d->globalReader = d->globalReader; - TQString fileName = TQString::fromLatin1("gkrellmrc") + alternativeAsString(); + TQString fileName = TQString::tqfromLatin1("gkrellmrc") + alternativeAsString(); m_theme.reparse(currentUrl(), fileName, currentAlternative()); } @@ -948,7 +948,7 @@ void KSim::ThemeLoader::reColourImage(TQImage &image) if (!d->recolour || image.isNull()) return; - TQColor color = TQApplication::palette().active().background(); + TQColor color = TQApplication::tqpalette().active().background(); TQImage output(image.width(), image.height(), 32); output.setAlphaBuffer(image.hasAlphaBuffer()); @@ -1036,7 +1036,7 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt) { TQString homePath = TQDir::current().path(); homePath = locateLocal( "data", "ksim" ) - + TQString::fromLatin1( "/themes" ) + + TQString::tqfromLatin1( "/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::fromLatin1("bg_meter_"); + TQString bgMeter = TQString::tqfromLatin1("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::fromLatin1("bg_panel_"); + TQString bgPanel = TQString::tqfromLatin1("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::fromLatin1("host/bg_panel"); + TQString tempFile = TQString::tqfromLatin1("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::fromLatin1("decal_net_leds"); + tempFile = TQString::tqfromLatin1("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::fromLatin1("_") + return (alternative == 0 ? TQString() : TQString::tqfromLatin1("_") + TQString::number(alternative)); } @@ -1225,7 +1225,7 @@ KSim::ThemeLoader::ThemeLoader() m_theme.create(d->fileNames, d->imageTypes, d->globalReader); - TQString fileName = TQString::fromLatin1("gkrellmrc") + alternativeAsString(); + TQString fileName = TQString::tqfromLatin1("gkrellmrc") + alternativeAsString(); m_theme.init(currentUrl(), fileName, currentAlternative()); reColourItems(); diff --git a/ksim/library/themetypes.h b/ksim/library/themetypes.h index 9ca4bb4..82b7aa3 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::fromLatin1("/") : returnString; + return incSlash ? returnString + TQString::tqfromLatin1("/") : returnString; } } } diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index dfbaf9b..39bbffd 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -20,9 +20,9 @@ #include "ksimcpu.h" #include "ksimcpu.moc" -#include <textstream.h> +#include <tqtextstream.h> #include <tqregexp.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <tqfile.h> #include <tqgroupbox.h> @@ -201,7 +201,7 @@ void CpuView::updateView() cpuDiff = 100; } - current.chart()->setText(i18n("%1%").arg(cpuDiff)); + current.chart()->setText(i18n("%1%").tqarg(cpuDiff)); current.chart()->setValue(cpuDiff, 0); current.label()->setValue(cpuDiff); } @@ -377,27 +377,27 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) mainLayout->addWidget( m_listView ); - TQHBoxLayout * layout = new TQHBoxLayout; - layout->setSpacing( 6 ); + TQHBoxLayout * tqlayout = new TQHBoxLayout; + tqlayout->setSpacing( 6 ); TQSpacerItem * spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - layout->addItem(spacer); + tqlayout->addItem(spacer); m_modify = new TQPushButton( this ); m_modify->setText( i18n( "Modify..." ) ); connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) ); - layout->addWidget( m_modify ); - mainLayout->addLayout( layout ); + tqlayout->addWidget( m_modify ); + mainLayout->addLayout( tqlayout ); m_legendBox = new TQGroupBox(this); m_legendBox->setColumnLayout(0, Qt::Vertical); m_legendBox->setTitle(i18n("Chart Legend")); - m_legendBox->layout()->setSpacing(0); - m_legendBox->layout()->setMargin(0); + m_legendBox->tqlayout()->setSpacing(0); + m_legendBox->tqlayout()->setMargin(0); - m_legendLayout = new TQVBoxLayout(m_legendBox->layout()); - m_legendLayout->setAlignment(TQt::AlignTop); + m_legendLayout = new TQVBoxLayout(m_legendBox->tqlayout()); + m_legendLayout->tqsetAlignment(TQt::AlignTop); m_legendLayout->setSpacing(6); m_legendLayout->setMargin(11); @@ -420,7 +420,7 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) for (uint i = 0; i < addCpus(); ++i) { - TQCheckListItem *item = new TQCheckListItem(m_listView, i18n("cpu %1").arg(i), TQCheckListItem::CheckBox); + TQCheckListItem *item = new TQCheckListItem(m_listView, i18n("cpu %1").tqarg(i), TQCheckListItem::CheckBox); item->setText(1, "%T"); } } diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index 3a4e921..c91f173 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -20,10 +20,10 @@ #include "ksimdisk.h" #include "ksimdisk.moc" -#include <textstream.h> +#include <tqtextstream.h> #include <tqregexp.h> #include <tqtimer.h> -#include <layout.h> +#include <tqlayout.h> #include <tqradiobutton.h> #include <tqvbuttongroup.h> #include <tqpushbutton.h> @@ -216,13 +216,13 @@ void DiskView::updateDisplay() if (m_useSeperatly) { it.current()->first->setValue(diskData.readBlocks, diskData.writeBlocks); it.current()->first->setText(i18n("in: %1k") - .arg(KGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)), - i18n("out: %1k").arg(KGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1))); + .tqarg(KGlobal::locale()->formatNumber((float)diskData.readBlocks / 1024.0, 1)), + i18n("out: %1k").tqarg(KGlobal::locale()->formatNumber((float)diskData.writeBlocks / 1024.0, 1))); } else { it.current()->first->setValue(diff, 0); it.current()->first->setText(i18n("%1k") - .arg(KGlobal::locale()->formatNumber((float)diff / 1024.0, 1))); + .tqarg(KGlobal::locale()->formatNumber((float)diff / 1024.0, 1))); } it.current()->second->setMaxValue(it.current()->first->maxValue()); @@ -239,7 +239,7 @@ void DiskView::updateData(DiskList &disks) if (!m_procStream) return; - m_procStream->device()->reset(); + m_procStream->tqdevice()->reset(); fseek(m_procFile, 0L, SEEK_SET); if (m_bLinux24) @@ -414,23 +414,23 @@ TQString DiskView::diskName( int major, int minor ) const switch ( major ) { case IDE0_MAJOR: - returnValue.prepend(TQString::fromLatin1("hda")); + returnValue.prepend(TQString::tqfromLatin1("hda")); break; case IDE1_MAJOR: - returnValue.prepend(TQString::fromLatin1("hdc")); + returnValue.prepend(TQString::tqfromLatin1("hdc")); break; case IDE3_MAJOR: - returnValue.prepend(TQString::fromLatin1("hde")); + returnValue.prepend(TQString::tqfromLatin1("hde")); break; case SCSI_DISK0_MAJOR: - returnValue.prepend(TQString::fromLatin1("sda")); + returnValue.prepend(TQString::tqfromLatin1("sda")); break; case SCSI_GENERIC_MAJOR: - returnValue.prepend(TQString::fromLatin1("sg0")); + returnValue.prepend(TQString::tqfromLatin1("sg0")); break; } - returnValue.at(2) = returnValue.at(2).latin1() + minor; + returnValue.tqat(2) = returnValue.tqat(2).latin1() + minor; return returnValue; #else Q_UNUSED(major); @@ -482,23 +482,23 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name) m_listview->addColumn(i18n("Disks")); m_layout->addWidget(m_listview); - TQHBoxLayout *layout = new TQHBoxLayout; - layout->setSpacing(6); + TQHBoxLayout *tqlayout = new TQHBoxLayout; + tqlayout->setSpacing(6); TQSpacerItem *spacer = new TQSpacerItem(20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum); - layout->addItem(spacer); + tqlayout->addItem(spacer); m_add = new TQPushButton(this); m_add->setText(i18n("Add...")); connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); - layout->addWidget(m_add); + tqlayout->addWidget(m_add); m_remove = new TQPushButton(this); m_remove->setText(i18n("Remove")); connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); - layout->addWidget(m_remove); - m_layout->addLayout(layout); + tqlayout->addWidget(m_remove); + m_layout->addLayout(tqlayout); m_buttonBox = new TQVButtonGroup(i18n("Disk Styles"), this); m_layout->addWidget(m_buttonBox); diff --git a/ksim/monitors/filesystem/filesystemstats.cpp b/ksim/monitors/filesystem/filesystemstats.cpp index 1aa156d..fa215fc 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::fromLatin1( _PATH_MOUNTED ) ); + TQFile file( TQString::tqfromLatin1( _PATH_MOUNTED ) ); if ( !file.open( IO_ReadOnly ) ) return list; diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index ac81156..fb04470 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -21,7 +21,7 @@ #include <pluginmodule.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpopupmenu.h> #include <tqregexp.h> #include <tqcursor.h> @@ -188,11 +188,11 @@ void FilesystemWidget::processExited(KProcess *) TQStringList::Iterator it; for (it = errorList.begin(); it != errorList.end(); ++it) { - message += TQString::fromLatin1("<li>%1</li>") - .arg((*it).replace(TQRegExp("[u]?mount: "), TQString())); + message += TQString::tqfromLatin1("<li>%1</li>") + .tqarg((*it).replace(TQRegExp("[u]?mount: "), TQString())); } - message += TQString::fromLatin1("</ul></qt>"); + message += TQString::tqfromLatin1("</ul></qt>"); KMessageBox::sorry(0, message); } diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp index 37646b7..6b8c928 100644 --- a/ksim/monitors/filesystem/fsystemconfig.cpp +++ b/ksim/monitors/filesystem/fsystemconfig.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqlabel.h> #include <tqwhatsthis.h> @@ -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->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + m_intervalLabel->tqsetSizePolicy(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->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_mainLayout->addMultiCellWidget(intervalLabel, 3, 3, 2, 2); diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp index 9af2b2d..9b08da9 100644 --- a/ksim/monitors/filesystem/ksimfsystem.cpp +++ b/ksim/monitors/filesystem/ksimfsystem.cpp @@ -21,7 +21,7 @@ #include <config.h> -#include <layout.h> +#include <tqlayout.h> #include <tqvaluelist.h> #include <tqtimer.h> #include <tqfile.h> diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp index ecff93d..c265055 100644 --- a/ksim/monitors/i8k/ksimi8k.cpp +++ b/ksim/monitors/i8k/ksimi8k.cpp @@ -19,10 +19,10 @@ #include "ksimi8k.h" -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqregexp.h> #include <tqlabel.h> #include <tqcheckbox.h> @@ -151,15 +151,15 @@ void I8KView::closeStream() void I8KView::initGUI() { - TQVBoxLayout *layout = new TQVBoxLayout( this ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); m_fan1Label = new KSim::Label( this ); m_fan2Label = new KSim::Label( this ); m_tempLabel = new KSim::Label( this ); - layout->addWidget( m_fan1Label ); - layout->addWidget( m_fan2Label ); - layout->addWidget( m_tempLabel ); + tqlayout->addWidget( m_fan1Label ); + tqlayout->addWidget( m_fan2Label ); + tqlayout->addWidget( m_tempLabel ); } void I8KView::updateView() @@ -195,17 +195,17 @@ void I8KView::updateView() } if ( rightspeed > 0 ) - m_fan1Label->setText( i18n( "Right fan: %1 RPM" ).arg( rightspeed ) ); + m_fan1Label->setText( i18n( "Right fan: %1 RPM" ).tqarg( rightspeed ) ); else m_fan1Label->setText( i18n( "Right fan: Off" ) ); if ( leftspeed > 0 ) - m_fan2Label->setText( i18n( "Left fan: %1 RPM" ).arg( leftspeed ) ); + m_fan2Label->setText( i18n( "Left fan: %1 RPM" ).tqarg( leftspeed ) ); else m_fan2Label->setText( i18n( "Left fan: Off" ) ); - m_tempLabel->setText( i18n( "CPU temp: %1°%2" ).arg( cputemp ) - .arg( m_unit ) ); + m_tempLabel->setText( i18n( "CPU temp: %1°%2" ).tqarg( cputemp ) + .tqarg( m_unit ) ); } I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name) @@ -218,14 +218,14 @@ I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name) m_interval->setRange( 2, 60, 1, true ); m_interval->setSuffix( i18n( " sec" ) ); - TQGridLayout *layout = new TQGridLayout( this, 3, 2, 0, + TQGridLayout *tqlayout = new TQGridLayout( this, 3, 2, 0, KDialog::spacingHint() ); - layout->addMultiCellWidget( m_unit, 0, 0, 0, 1 ); - layout->addWidget( label, 1, 0 ); - layout->addWidget( m_interval, 1, 1 ); - layout->setColStretch( 1, 1 ); - layout->setRowStretch( 2, 1 ); + tqlayout->addMultiCellWidget( m_unit, 0, 0, 0, 1 ); + tqlayout->addWidget( label, 1, 0 ); + tqlayout->addWidget( m_interval, 1, 1 ); + tqlayout->setColStretch( 1, 1 ); + tqlayout->setRowStretch( 2, 1 ); } I8KConfig::~I8KConfig() diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp index 136d314..eb2614f 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.cpp +++ b/ksim/monitors/lm_sensors/ksimsensors.cpp @@ -27,7 +27,7 @@ #include <kaboutdata.h> #include <kconfig.h> -#include <layout.h> +#include <tqlayout.h> #include <label.h> #include <themetypes.h> diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp index 45251db..cabbf5a 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::fromLatin1(name)))); + chipset, sensorType(TQString::tqfromLatin1(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::fromLatin1("GPU Temp"); + TQString name = TQString::tqfromLatin1("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::fromLatin1("GPU Ambient Temp"); + TQString name = TQString::tqfromLatin1("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::fromLatin1("°F"); + return TQString::tqfromLatin1("°F"); else - return TQString::fromLatin1("°C"); + return TQString::tqfromLatin1("°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 7406016..1f1cf10 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.cpp +++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp @@ -31,7 +31,7 @@ #include <tqtimer.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcheckbox.h> #include <tqcursor.h> #include <tqpopupmenu.h> @@ -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->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + m_updateLabel->tqsetSizePolicy(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->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_layout->addMultiCellWidget(intervalLabel, 4, 4, 2, 2); } diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp index 4e03a5c..f6cbe4a 100644 --- a/ksim/monitors/mail/ksimmail.cpp +++ b/ksim/monitors/mail/ksimmail.cpp @@ -20,7 +20,7 @@ // $Id$ #include <tqbitmap.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <kaboutapplication.h> @@ -69,10 +69,10 @@ void MailPlugin::showAbout() MailView::MailView( KSim::PluginObject* parent, const char* name ) : KSim::PluginView( parent, name ) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); MailLabel* label = new MailLabel( this ); - layout->addWidget( label, 0, AlignHCenter ); + tqlayout->addWidget( label, 0, AlignHCenter ); } MailView::~MailView() @@ -101,7 +101,7 @@ MailLabel::~MailLabel() { } -void MailLabel::configureObject( bool repaint ) +void MailLabel::configureObject( bool tqrepaint ) { m_envelope.load( themeLoader().current().mailPixmap() ); m_frames = themeLoader().current().mailFrames(); @@ -112,7 +112,7 @@ void MailLabel::configureObject( bool repaint ) setPixmap( frame( m_envelope, 1 ) ); - KSim::Label::configureObject( repaint ); + KSim::Label::configureObject( tqrepaint ); } void MailLabel::paintEvent( TQPaintEvent* e ) diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index f97871a..42e0ffd 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -34,10 +34,10 @@ static int mib[] = { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0 }; #endif #include <tqpushbutton.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqfile.h> #include <tqdatetime.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtimer.h> #include <tqregexp.h> #include <tqcursor.h> @@ -356,7 +356,7 @@ void NetView::updateGraph() if ( ( *it ).label() ) { timeDisplay = ( *it ).format(); - newPid = pid.arg( ( *it ).name() ); + newPid = pid.tqarg( ( *it ).name() ); if ( TQFile::exists( newPid ) && stat( TQFile::encodeName( newPid ).data(), &st ) == 0 ) { @@ -394,16 +394,16 @@ void NetView::updateGraph() TQString receiveString = KGlobal::locale()->formatNumber( ( float ) receiveDiff / 1024.0, 1 ); TQString sendString = KGlobal::locale()->formatNumber( ( float ) sendDiff / 1024.0, 1 ); - ( *it ).chart()->setText( i18n( "in: %1k" ).arg( receiveString ), - i18n( "out: %1k" ).arg( sendString ) ); + ( *it ).chart()->setText( i18n( "in: %1k" ).tqarg( receiveString ), + i18n( "out: %1k" ).tqarg( sendString ) ); } else { ( *it ).setData( NetData() ); ( *it ).chart()->setValue( 0, 0 ); - ( *it ).chart()->setText( i18n( "in: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ), - i18n( "out: %1k" ).arg( KGlobal::locale()->formatNumber( 0.0, 1 ) ) ); + ( *it ).chart()->setText( i18n( "in: %1k" ).tqarg( KGlobal::locale()->formatNumber( 0.0, 1 ) ), + i18n( "out: %1k" ).tqarg( KGlobal::locale()->formatNumber( 0.0, 1 ) ) ); if ( ( *it ).label() ) ( *it ).label()->setText( i18n( "offline" ) ); diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp index ccb276f..f3e98b7 100644 --- a/ksim/monitors/net/netconfig.cpp +++ b/ksim/monitors/net/netconfig.cpp @@ -18,7 +18,7 @@ */ #include <tqpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcursor.h> #include <klistview.h> @@ -56,29 +56,29 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) TQT_SLOT(modifyItem(TQListViewItem *))); mainLayout->addWidget(usingBox); - layout = new TQHBoxLayout; - layout->setSpacing(6); + tqlayout = new TQHBoxLayout; + tqlayout->setSpacing(6); TQSpacerItem *spacer = new TQSpacerItem(20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum); - layout->addItem(spacer); + tqlayout->addItem(spacer); insertButton = new TQPushButton(this); insertButton->setText(i18n("Add...")); connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog())); - layout->addWidget(insertButton); + tqlayout->addWidget(insertButton); modifyButton = new TQPushButton(this); modifyButton->setText(i18n("Modify...")); connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent())); - layout->addWidget(modifyButton); + tqlayout->addWidget(modifyButton); removeButton = new TQPushButton(this); removeButton->setText(i18n("Remove")); connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent())); - layout->addWidget(removeButton); + tqlayout->addWidget(removeButton); - mainLayout->addLayout(layout); + mainLayout->addLayout(tqlayout); } NetConfig::~NetConfig() @@ -144,8 +144,8 @@ void NetConfig::menu(KListView *, TQListViewItem *item, const TQPoint &) if (item) { aboutMenu->insertItem(i18n("&Add Net Device"), 3); - aboutMenu->insertItem(i18n("&Modify '%1'").arg(item->text(0)), 2); - aboutMenu->insertItem(i18n("&Remove '%1'").arg(item->text(0)), 1); + aboutMenu->insertItem(i18n("&Modify '%1'").tqarg(item->text(0)), 2); + aboutMenu->insertItem(i18n("&Remove '%1'").tqarg(item->text(0)), 1); } else { aboutMenu->insertItem(i18n("&Add Net Device"), 3); @@ -217,7 +217,7 @@ void NetConfig::removeItem(TQListViewItem *item) return; int result = KMessageBox::warningContinueCancel(0, i18n("Are you sure you " - "want to remove the net interface '%1'?").arg(item->text(0)), TQString(), KStdGuiItem::del()); + "want to remove the net interface '%1'?").tqarg(item->text(0)), TQString(), KStdGuiItem::del()); if (result == KMessageBox::Cancel) return; diff --git a/ksim/monitors/net/netconfig.h b/ksim/monitors/net/netconfig.h index c2b5387..4d6de56 100644 --- a/ksim/monitors/net/netconfig.h +++ b/ksim/monitors/net/netconfig.h @@ -54,7 +54,7 @@ class NetConfig : public KSim::PluginPage // Couldnt think of a better name for this :) const TQString &boolToString(bool) const; - TQHBoxLayout *layout; + TQHBoxLayout *tqlayout; TQPushButton *insertButton; TQPushButton *removeButton; TQPushButton *modifyButton; diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index d16f117..c470a2c 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -26,7 +26,7 @@ #include <tqpushbutton.h> #include <tqtabwidget.h> #include <tqwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <tqfile.h> #include <tqregexp.h> @@ -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->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + m_deviceCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); m_deviceCombo->setFocus(); m_deviceCombo->setDuplicatesEnabled(false); @@ -86,10 +86,10 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_timerBox = new TQGroupBox(m_generalTab); m_timerBox->setTitle(i18n("Timer")); m_timerBox->setColumnLayout(0, Qt::Vertical); - m_timerBox->layout()->setSpacing(0); - m_timerBox->layout()->setMargin(0); - m_timerBoxLayout = new TQVBoxLayout(m_timerBox->layout()); - m_timerBoxLayout->setAlignment(TQt::AlignTop); + m_timerBox->tqlayout()->setSpacing(0); + m_timerBox->tqlayout()->setMargin(0); + m_timerBoxLayout = new TQVBoxLayout(m_timerBox->tqlayout()); + m_timerBoxLayout->tqsetAlignment(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 3dfc236..b79fc80 100644 --- a/ksim/monitors/snmp/browsedialogbase.ui +++ b/ksim/monitors/snmp/browsedialogbase.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -157,7 +157,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -205,7 +205,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>20</height> diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp index 797e5ce..ee50054 100644 --- a/ksim/monitors/snmp/configpage.cpp +++ b/ksim/monitors/snmp/configpage.cpp @@ -24,7 +24,7 @@ #include "hostdialog.h" #include "monitordialog.h" -#include <layout.h> +#include <tqlayout.h> #include <tqgroupbox.h> #include <tqpushbutton.h> diff --git a/ksim/monitors/snmp/configwidget.ui b/ksim/monitors/snmp/configwidget.ui index 69b94db..608dc8f 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>141</width> <height>20</height> @@ -156,7 +156,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui index f25aa12..d3da054 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>20</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>41</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>160</width> <height>20</height> @@ -253,7 +253,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>20</height> @@ -309,7 +309,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>351</width> <height>20</height> @@ -384,7 +384,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="5"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -408,7 +408,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>220</width> <height>20</height> diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp index 6ab85b6..1bcbb0b 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::fromLatin1( "Label" ); - case MonitorConfig::Chart: return TQString::fromLatin1( "Chart" ); + case MonitorConfig::Label: return TQString::tqfromLatin1( "Label" ); + case MonitorConfig::Chart: return TQString::tqfromLatin1( "Chart" ); default: assert( false ); }; return TQString(); diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui index bb7f7cc..5f9fb53 100644 --- a/ksim/monitors/snmp/monitordialogbase.ui +++ b/ksim/monitors/snmp/monitordialogbase.ui @@ -104,7 +104,7 @@ <property name="text"> <string>The text in the edit box is what is displayed except that any occurrence of <b>%s</b> will be replaced with the snmp object value and any occurrence of <b>%n</b> will be replaced with the name of this monitor (see Name input field) .</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -112,7 +112,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>141</width> <height>20</height> @@ -174,7 +174,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -205,7 +205,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>271</width> <height>20</height> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>244</width> <height>20</height> @@ -246,7 +246,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>210</width> <height>20</height> @@ -282,7 +282,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -335,7 +335,7 @@ <cstring>status</cstring> </property> <property name="text"> - <string>blehStatus</string> + <string>blehtqStatus</string> </property> </widget> <widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="4"> diff --git a/ksim/monitors/snmp/proberesultdialog.cpp b/ksim/monitors/snmp/proberesultdialog.cpp index bed1e21..1c8033a 100644 --- a/ksim/monitors/snmp/proberesultdialog.cpp +++ b/ksim/monitors/snmp/proberesultdialog.cpp @@ -30,7 +30,7 @@ ProbeResultDialog::ProbeResultDialog( const HostConfig &hostConfig, const ProbeD TQWidget *parent, const char *name ) : ProbeResultDialogBase( parent, name ) { - info->setText( i18n( "Results of scanning host %1:" ).arg( hostConfig.name ) ); + info->setText( i18n( "Results of scanning host %1:" ).tqarg( hostConfig.name ) ); for ( ProbeDialog::ProbeResultList::ConstIterator it = probeResults.begin(); it != probeResults.end(); ++it ) diff --git a/ksim/monitors/snmp/proberesultdialogbase.ui b/ksim/monitors/snmp/proberesultdialogbase.ui index dcdbd2a..c3df9bd 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="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/ksim/monitors/snmp/session.cpp b/ksim/monitors/snmp/session.cpp index 6d63fab..2f16adc 100644 --- a/ksim/monitors/snmp/session.cpp +++ b/ksim/monitors/snmp/session.cpp @@ -54,7 +54,7 @@ Session::Session( const HostConfig &source ) d->source = source; - // unicode madness + // tqunicode madness d->host = source.name.ascii(); d->community = source.community.ascii(); d->securityName = source.securityName.ascii(); diff --git a/ksim/monitors/snmp/snmp.cpp b/ksim/monitors/snmp/snmp.cpp index ae04b67..d79c596 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::fromLatin1( array[ i ].stringValue ); + result << TQString::tqfromLatin1( 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::fromLatin1( array[ i ].stringValue ); + return TQString::tqfromLatin1( 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::fromLatin1( array[ i ].stringValue ).lower() == string ) { + if ( TQString::tqfromLatin1( 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::fromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) ); + return TQString::tqfromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) ); if ( errorCode >= SNMP_ERR_NOERROR && errorCode <= MAX_SNMP_ERR ) - return TQString::fromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) ); + return TQString::tqfromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) ); return TQString(); } diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp index ad707b5..2803aec 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::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::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::Invalid: case Value::Null: return TQString(); } @@ -321,7 +321,7 @@ TQString Value::formatTimeTicks( int ticks, int conversionFlags ) if ( days > 0 ) result += TQString::number( days ) + "d:"; - result += TQString(TQString::fromAscii( "%1h:%2m" )).arg( hours ).arg( minutes ); + result += TQString(TQString::fromAscii( "%1h:%2m" )).tqarg( hours ).tqarg( minutes ); if ( conversionFlags & TimeTicksWithSeconds ) result += ":" + TQString::number( seconds ) + "s"; diff --git a/ksim/monitors/snmp/view.cpp b/ksim/monitors/snmp/view.cpp index 4b01203..9515645 100644 --- a/ksim/monitors/snmp/view.cpp +++ b/ksim/monitors/snmp/view.cpp @@ -23,7 +23,7 @@ #include <label.h> -#include <layout.h> +#include <tqlayout.h> #include <kconfig.h> diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp index d3964a5..afabec5 100644 --- a/ksim/themeprefs.cpp +++ b/ksim/themeprefs.cpp @@ -21,7 +21,7 @@ #include "themeprefs.moc" #include <tqdir.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtooltip.h> #include <tqlabel.h> #include <tqregexp.h> @@ -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->setAlignment(TQLabel::WordBreak | + m_label->tqsetAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft); m_themeLayout->addMultiCellWidget(m_label, 0, 0, 0, 4); TQString themeDir(locateLocal("data", "ksim")); - themeDir += TQString::fromLatin1("/themes"); + themeDir += TQString::tqfromLatin1("/themes"); m_urlLabel = new KURLLabel(this); m_urlLabel->setText(i18n("Open Konqueror in KSim's theme folder")); - m_urlLabel->setURL(TQString::fromLatin1("file://") + themeDir); + m_urlLabel->setURL(TQString::tqfromLatin1("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->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, + m_authorLabel->tqsetSizePolicy(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->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + m_authLabel->tqsetSizePolicy(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->setAlignment(AlignVCenter | AlignRight); + m_alternateLabel->tqsetAlignment(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->setAlignment(AlignVCenter | AlignRight); - m_fontLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, + m_fontLabel->tqsetAlignment(AlignVCenter | AlignRight); + m_fontLabel->tqsetSizePolicy(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->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + m_fontsCombo->tqsetSizePolicy(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 62d7460..a387d87 100644 --- a/ktimer/ktimer.cpp +++ b/ktimer/ktimer.cpp @@ -59,7 +59,7 @@ public: KTimerJob *job() { return m_job; }; - void setStatus( bool error ) { + void settqStatus( 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->setStatus( error ); + item->settqStatus( error ); m_list->triggerUpdate(); } @@ -249,7 +249,7 @@ void KTimerPref::saveJobs( KConfig *cfg ) int num = 0; KTimerJobItem *item = static_cast<KTimerJobItem*>(m_list->firstChild()); while( item ) { - item->job()->save( cfg, TQString("Job%1").arg( num ) ); + item->job()->save( cfg, TQString("Job%1").tqarg( num ) ); item = static_cast<KTimerJobItem*>(item->nextSibling()); num++; } @@ -280,7 +280,7 @@ void KTimerPref::loadJobs( KConfig *cfg ) connect( job, TQT_SIGNAL(finished(KTimerJob*,bool)), TQT_SLOT(jobFinished(KTimerJob*,bool)) ); - job->load( cfg, TQString( "Job%1" ).arg(n) ); + job->load( cfg, TQString( "Job%1" ).tqarg(n) ); job->setUser( item ); } diff --git a/ktimer/prefwidget.ui b/ktimer/prefwidget.ui index 1989ba4..766d39b 100644 --- a/ktimer/prefwidget.ui +++ b/ktimer/prefwidget.ui @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -183,7 +183,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kwallet/allyourbase.cpp b/kwallet/allyourbase.cpp index d06898c..c031b35 100644 --- a/kwallet/allyourbase.cpp +++ b/kwallet/allyourbase.cpp @@ -40,7 +40,7 @@ */ KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, const TQString &name, int entries) : KListViewItem(parent),_wallet(w),_name(name),_entries(entries) { - setText(0, TQString("%1 (%2)").arg(_name).arg(_entries)); + setText(0, TQString("%1 (%2)").tqarg(_name).tqarg(_entries)); setRenameEnabled(0, false); setDragEnabled(true); setDropEnabled(true); @@ -66,7 +66,7 @@ TQPixmap KWalletFolderItem::getFolderIcon(KIcon::Group group){ void KWalletFolderItem::refresh() { TQString saveFolder = _wallet->currentFolder(); _wallet->setFolder(_name); - setText(0, TQString("%1 (%2)").arg(_name).arg(_wallet->entryList().count())); + setText(0, TQString("%1 (%2)").tqarg(_name).tqarg(_wallet->entryList().count())); _wallet->setFolder(saveFolder); } @@ -194,7 +194,7 @@ static bool decodeEntry(KWallet::Wallet *_wallet, TQDataStream& ds) { KWallet::Wallet::EntryType et; ds >> name; if (_wallet->hasEntry(name)) { - int rc = KMessageBox::warningContinueCancel(0L, i18n("An entry by the name '%1' already exists. Would you like to continue?").arg(name)); + int rc = KMessageBox::warningContinueCancel(0L, i18n("An entry by the name '%1' already exists. Would you like to continue?").tqarg(name)); if (rc == KMessageBox::Cancel) { return false; } @@ -217,7 +217,7 @@ static bool decodeFolder(KWallet::Wallet *_wallet, TQDataStream& ds) { TQString folder; ds >> folder; if (_wallet->hasFolder(folder)) { - int rc = KMessageBox::warningYesNoCancel(0L, i18n("A folder by the name '%1' already exists. What would you like to do?").arg(folder), TQString(), KStdGuiItem::cont(), i18n("Replace")); + int rc = KMessageBox::warningYesNoCancel(0L, i18n("A folder by the name '%1' already exists. What would you like to do?").tqarg(folder), TQString(), KStdGuiItem::cont(), i18n("Replace")); if (rc == KMessageBox::Cancel) { return false; } @@ -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->encodedData("application/x-kwallet-folder"); + TQByteArray edata = e->tqencodedData("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->encodedData("application/x-kwallet-entry"); + TQByteArray data = e->tqencodedData("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->encodedData("application/x-kwallet-folder"); + TQByteArray data = e->tqencodedData("application/x-kwallet-folder"); if (data.isEmpty()) { e->ignore(); return; @@ -589,11 +589,11 @@ class KWalletIconDrag : public TQIconDrag { return 0L; } - TQByteArray encodedData(const char *mime) const { + TQByteArray tqencodedData(const char *mime) const { TQByteArray a; TQCString mimetype(mime); if (mimetype == "application/x-qiconlist") { - return TQIconDrag::encodedData(mime); + return TQIconDrag::tqencodedData(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->encodedData("text/uri-list"); + TQByteArray edata = e->tqencodedData("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 65d8b5a..0b421c7 100644 --- a/kwallet/kbetterthankdialogbase.ui +++ b/kwallet/kbetterthankdialogbase.ui @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>21</height> @@ -46,7 +46,7 @@ </spacer> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -99,7 +99,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp index c6429cc..fd058ad 100644 --- a/kwallet/konfigurator/konfigurator.cpp +++ b/kwallet/konfigurator/konfigurator.cpp @@ -32,7 +32,7 @@ #include <tqcheckbox.h> #include <tqcombobox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlistview.h> #include <tqpushbutton.h> #include <tqspinbox.h> diff --git a/kwallet/konfigurator/walletconfigwidget.ui b/kwallet/konfigurator/walletconfigwidget.ui index da3a642..eaf5cf2 100644 --- a/kwallet/konfigurator/walletconfigwidget.ui +++ b/kwallet/konfigurator/walletconfigwidget.ui @@ -64,7 +64,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -281,7 +281,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -319,7 +319,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>16</height> @@ -415,7 +415,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>369</width> <height>21</height> diff --git a/kwallet/kwalleteditor.cpp b/kwallet/kwalleteditor.cpp index ec07768..e79610f 100644 --- a/kwallet/kwalleteditor.cpp +++ b/kwallet/kwalleteditor.cpp @@ -47,15 +47,15 @@ #include <tqcheckbox.h> #include <tqcombobox.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <tqlistview.h> #include <tqptrstack.h> #include <tqpushbutton.h> -#include <stylesheet.h> -#include <textedit.h> +#include <tqstylesheet.h> +#include <tqtextedit.h> #include <tqtimer.h> #include <tqwidgetstack.h> @@ -133,7 +133,7 @@ KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *pare setCaption(wallet); - TQTimer::singleShot(0, this, TQT_SLOT(layout())); + TQTimer::singleShot(0, this, TQT_SLOT(tqlayout())); } KWalletEditor::~KWalletEditor() { @@ -149,7 +149,7 @@ KWalletEditor::~KWalletEditor() { } } -void KWalletEditor::layout() { +void KWalletEditor::tqlayout() { TQValueList<int> sz = _ww->_splitter->sizes(); int sum = sz[0] + sz[1]; sz[0] = sum/2; @@ -293,7 +293,7 @@ void KWalletEditor::deleteFolder() { return; } - int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the folder '%1' from the wallet?").arg(fi->name()),"",KStdGuiItem::del()); + int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the folder '%1' from the wallet?").tqarg(fi->name()),"",KStdGuiItem::del()); if (rc == KMessageBox::Continue) { bool rc = _w->removeFolder(fi->name()); if (!rc) { @@ -366,7 +366,7 @@ void KWalletEditor::saveEntry() { } } - KMessageBox::sorry(this, i18n("Error saving entry. Error code: %1").arg(rc)); + KMessageBox::sorry(this, i18n("Error saving entry. Error code: %1").tqarg(rc)); } @@ -402,7 +402,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) { if (_w->readPassword(item->text(0), pass) == 0) { _ww->_entryStack->raiseWidget(int(4)); _ww->_entryName->setText(i18n("Password: %1") - .arg(item->text(0))); + .tqarg(item->text(0))); _ww->_passwordValue->setText(pass); _ww->_saveChanges->setEnabled(false); _ww->_undoChanges->setEnabled(false); @@ -413,7 +413,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) { showHideMapEditorValue(false); if (_w->readMap(item->text(0), _currentMap) == 0) { _mapEditor->reload(); - _ww->_entryName->setText(i18n("Name-Value Map: %1").arg(item->text(0))); + _ww->_entryName->setText(i18n("Name-Value Map: %1").tqarg(item->text(0))); _ww->_saveChanges->setEnabled(false); _ww->_undoChanges->setEnabled(false); } @@ -422,7 +422,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) { TQByteArray ba; if (_w->readEntry(item->text(0), ba) == 0) { _ww->_entryName->setText(i18n("Binary Data: %1") - .arg(item->text(0))); + .tqarg(item->text(0))); _ww->_saveChanges->setEnabled(false); _ww->_undoChanges->setEnabled(false); } @@ -454,7 +454,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) { if (fi) { _currentFolder = fi->name(); - _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0))); + _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").tqarg(fi->text(0))); _ww->_iconTitle->setPixmap(fi->getFolderIcon(KIcon::Toolbar)); } } @@ -540,7 +540,7 @@ void KWalletEditor::updateEntries(const TQString& folder) { } fi->refresh(); if (fi->name() == _currentFolder) { - _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0))); + _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").tqarg(fi->text(0))); } if (!_entryList->selectedItem()) { _ww->_entryName->clear(); @@ -617,7 +617,7 @@ void KWalletEditor::copyPassword() { if (_w && item) { TQString pass; if (_w->readPassword(item->text(0), pass) == 0) { - TQApplication::clipboard()->setText(pass); + TQApplication::tqclipboard()->setText(pass); } } } @@ -700,7 +700,7 @@ void KWalletEditor::newEntry() { abort(); } fi->refresh(); - _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0))); + _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").tqarg(fi->text(0))); } } @@ -734,11 +734,11 @@ void KWalletEditor::listItemRenamed(TQListViewItem* item, int, const TQString& t return; } if (ci->type() == KWallet::Wallet::Password) { - _ww->_entryName->setText(i18n("Password: %1").arg(item->text(0))); + _ww->_entryName->setText(i18n("Password: %1").tqarg(item->text(0))); } else if (ci->type() == KWallet::Wallet::Map) { - _ww->_entryName->setText(i18n("Name-Value Map: %1").arg(item->text(0))); + _ww->_entryName->setText(i18n("Name-Value Map: %1").tqarg(item->text(0))); } else if (ci->type() == KWallet::Wallet::Stream) { - _ww->_entryName->setText(i18n("Binary Data: %1").arg(item->text(0))); + _ww->_entryName->setText(i18n("Binary Data: %1").tqarg(item->text(0))); } } else { i->setText(0, i->oldName()); @@ -750,7 +750,7 @@ void KWalletEditor::listItemRenamed(TQListViewItem* item, int, const TQString& t void KWalletEditor::deleteEntry() { TQListViewItem *item = _entryList->selectedItem(); if (_w && item) { - int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the item '%1'?").arg(item->text(0)),"",KStdGuiItem::del()); + int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the item '%1'?").tqarg(item->text(0)),"",KStdGuiItem::del()); if (rc == KMessageBox::Continue) { KWalletFolderItem *fi = dynamic_cast<KWalletFolderItem *>(item->parent()->parent()); if (!fi) { @@ -761,7 +761,7 @@ void KWalletEditor::deleteEntry() { delete item; entrySelectionChanged(_entryList->currentItem()); fi->refresh(); - _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0))); + _ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").tqarg(fi->text(0))); } } } @@ -818,7 +818,7 @@ void KWalletEditor::importWallet() { TQString tmpFile; if (!KIO::NetAccess::download(url, tmpFile, this)) { - KMessageBox::sorry(this, i18n("Unable to access wallet '<b>%1</b>'.").arg(url.prettyURL())); + KMessageBox::sorry(this, i18n("Unable to access wallet '<b>%1</b>'.").tqarg(url.prettyURL())); return; } @@ -847,7 +847,7 @@ void KWalletEditor::importWallet() { if (hasEntry && mp == Prompt) { KBetterThanKDialogBase *bd; bd = new KBetterThanKDialogBase(this); - bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").arg(TQStyleSheet::escape(*f)).arg(TQStyleSheet::escape(me.key()))); + bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").tqarg(TQStyleSheet::escape(*f)).tqarg(TQStyleSheet::escape(me.key()))); mp = (MergePlan)bd->exec(); delete bd; bool ok = false; @@ -877,7 +877,7 @@ void KWalletEditor::importWallet() { if (hasEntry && mp == Prompt) { KBetterThanKDialogBase *bd; bd = new KBetterThanKDialogBase(this); - bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").arg(TQStyleSheet::escape(*f)).arg(TQStyleSheet::escape(pe.key()))); + bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").tqarg(TQStyleSheet::escape(*f)).tqarg(TQStyleSheet::escape(pe.key()))); mp = (MergePlan)bd->exec(); delete bd; bool ok = false; @@ -907,7 +907,7 @@ void KWalletEditor::importWallet() { if (hasEntry && mp == Prompt) { KBetterThanKDialogBase *bd; bd = new KBetterThanKDialogBase(this); - bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").arg(TQStyleSheet::escape(*f)).arg(TQStyleSheet::escape(ee.key()))); + bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").tqarg(TQStyleSheet::escape(*f)).tqarg(TQStyleSheet::escape(ee.key()))); mp = (MergePlan)bd->exec(); delete bd; bool ok = false; @@ -946,20 +946,20 @@ void KWalletEditor::importXML() { TQString tmpFile; if (!KIO::NetAccess::download(url, tmpFile, this)) { - KMessageBox::sorry(this, i18n("Unable to access XML file '<b>%1</b>'.").arg(url.prettyURL())); + KMessageBox::sorry(this, i18n("Unable to access XML file '<b>%1</b>'.").tqarg(url.prettyURL())); return; } TQFile qf(tmpFile); if (!qf.open(IO_ReadOnly)) { - KMessageBox::sorry(this, i18n("Error opening XML file '<b>%1</b>' for input.").arg(url.prettyURL())); + KMessageBox::sorry(this, i18n("Error opening XML file '<b>%1</b>' for input.").tqarg(url.prettyURL())); KIO::NetAccess::removeTempFile(tmpFile); return; } TQDomDocument doc(tmpFile); if (!doc.setContent(&qf)) { - KMessageBox::sorry(this, i18n("Error reading XML file '<b>%1</b>' for input.").arg(url.prettyURL())); + KMessageBox::sorry(this, i18n("Error reading XML file '<b>%1</b>' for input.").tqarg(url.prettyURL())); KIO::NetAccess::removeTempFile(tmpFile); return; } @@ -998,7 +998,7 @@ void KWalletEditor::importXML() { if (hasEntry && mp == Prompt) { KBetterThanKDialogBase *bd; bd = new KBetterThanKDialogBase(this); - bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").arg(TQStyleSheet::escape(fname)).arg(TQStyleSheet::escape(ename))); + bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?").tqarg(TQStyleSheet::escape(fname)).tqarg(TQStyleSheet::escape(ename))); mp = (MergePlan)bd->exec(); delete bd; bool ok = false; @@ -1106,7 +1106,7 @@ void KWalletEditor::exportXML() { if (!url.isEmpty()) { bool ok = true; if (KIO::NetAccess::exists(url, false, this)) { - int rc = KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists. Would you like to overwrite this file?").arg(url.prettyURL()), i18n("Overwrite")); + int rc = KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists. Would you like to overwrite this file?").tqarg(url.prettyURL()), i18n("Overwrite")); if (rc == KMessageBox::Cancel) { ok = false; } diff --git a/kwallet/kwalleteditor.h b/kwallet/kwalleteditor.h index d38f4a2..02f1342 100644 --- a/kwallet/kwalleteditor.h +++ b/kwallet/kwalleteditor.h @@ -52,7 +52,7 @@ class KWalletEditor : public KMainWindow { void deleteFolder(); private slots: - void layout(); + void tqlayout(); void updateFolderList(bool checkEntries = false); void entrySelectionChanged(TQListViewItem *item); void listItemRenamed(TQListViewItem *, int, const TQString&); diff --git a/kwallet/kwalletmanager.cpp b/kwallet/kwalletmanager.cpp index 89de393..d65dcd2 100644 --- a/kwallet/kwalletmanager.cpp +++ b/kwallet/kwalletmanager.cpp @@ -220,13 +220,13 @@ void KWalletManager::contextMenu(TQIconViewItem *item, const TQPoint& pos) { void KWalletManager::deleteWallet(const TQString& walletName) { - int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the wallet '%1'?").arg(walletName),"",KStdGuiItem::del()); + int rc = KMessageBox::warningContinueCancel(this, i18n("Are you sure you wish to delete the wallet '%1'?").tqarg(walletName),"",KStdGuiItem::del()); if (rc != KMessageBox::Continue) { return; } rc = KWallet::Wallet::deleteWallet(walletName); if (rc != 0) { - KMessageBox::sorry(this, i18n("Unable to delete the wallet. Error code was %1.").arg(rc)); + KMessageBox::sorry(this, i18n("Unable to delete the wallet. Error code was %1.").tqarg(rc)); } updateWalletDisplay(); } @@ -239,7 +239,7 @@ void KWalletManager::closeWallet(const TQString& walletName) { if (rc == KMessageBox::Yes) { rc = KWallet::Wallet::closeWallet(walletName, true); if (rc != 0) { - KMessageBox::sorry(this, i18n("Unable to force the wallet closed. Error code was %1.").arg(rc)); + KMessageBox::sorry(this, i18n("Unable to force the wallet closed. Error code was %1.").tqarg(rc)); } } } @@ -260,7 +260,7 @@ void KWalletManager::openWalletFile(const TQString& path) { this, TQT_SLOT(editorClosed(KMainWindow*))); we->show(); } else { - KMessageBox::sorry(this, i18n("Error opening wallet %1.").arg(path)); + KMessageBox::sorry(this, i18n("Error opening wallet %1.").tqarg(path)); delete we; } } @@ -302,7 +302,7 @@ void KWalletManager::openWallet(const TQString& walletName, bool newWallet) { we->show(); _windows.append(we); } else if (!newWallet) { - KMessageBox::sorry(this, i18n("Error opening wallet %1.").arg(walletName)); + KMessageBox::sorry(this, i18n("Error opening wallet %1.").tqarg(walletName)); delete we; } } diff --git a/kwallet/kwmapeditor.cpp b/kwallet/kwmapeditor.cpp index dc6d4fb..d5a9722 100644 --- a/kwallet/kwmapeditor.cpp +++ b/kwallet/kwmapeditor.cpp @@ -27,9 +27,9 @@ #include <twin.h> #include <tqapplication.h> -#include <clipboard.h> +#include <tqclipboard.h> #include <tqpushbutton.h> -#include <textedit.h> +#include <tqtextedit.h> KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent, const char *name) : TQTable(0, 3, parent, name), _map(map) { @@ -125,7 +125,7 @@ void KWMapEditor::contextMenu(int row, int col, const TQPoint& pos) { void KWMapEditor::copy() { - TQApplication::clipboard()->setText(text(_contextRow, 2)); + TQApplication::tqclipboard()->setText(text(_contextRow, 2)); } @@ -142,7 +142,7 @@ class InlineEditor : public TQTextEdit { protected: virtual void focusOutEvent(TQFocusEvent* fe) { if (fe->reason() == TQFocusEvent::Popup) { - TQWidget *focusW = tqApp->focusWidget(); + TQWidget *focusW = tqApp->tqfocusWidget(); if (focusW && focusW == popup) { return; } diff --git a/kwallet/walletwidget.ui b/kwallet/walletwidget.ui index 9979097..dbe761e 100644 --- a/kwallet/walletwidget.ui +++ b/kwallet/walletwidget.ui @@ -47,7 +47,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>227</width> <height>21</height> @@ -105,7 +105,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -150,7 +150,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -222,7 +222,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>271</width> <height>20</height> @@ -268,7 +268,7 @@ <property name="text"> <string>This is a binary data entry. It cannot be editted as its format is unknown and application specific.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -282,7 +282,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>41</height> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>41</height> @@ -316,7 +316,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>41</height> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>21</height> @@ -366,7 +366,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>236</width> <height>21</height> @@ -383,7 +383,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>358</height> diff --git a/superkaramba/examples/richtext/richtext.py b/superkaramba/examples/richtext/richtext.py index 518aa65..11fe9d7 100644 --- a/superkaramba/examples/richtext/richtext.py +++ b/superkaramba/examples/richtext/richtext.py @@ -1,6 +1,6 @@ #Unicode Example -#For Symbol Tables look at www.unicode.org/charts/ +#For Symbol Tables look at www.tqunicode.org/charts/ hidden = 0 @@ -35,7 +35,7 @@ is used to encode the formatting commands.</p> <li>Hyperlinks: <a href="kfmclient openURL http://netdragon.sourceforge.net"> Superkaramba Homepage</a></li> <li>Links can also <a href="#trigger">trigger</a> actions in the script</li> <li><i>Various</i> <b>different</b> <u>caracter</u> <s>styles</s></li> -<li><a href="kfmclient openURL http://www.unicode.org">Unicode</a>: \u03B6 \u03B3 \u03BB \u03A3 \u03A9 </li> +<li><a href="kfmclient openURL http://www.tqunicode.org">Unicode</a>: \u03B6 \u03B3 \u03BB \u03A3 \u03A9 </li> <li>Simple Tables: <table bgcolor="darkgray" border="1" width="80%"> <tr><th colspan="3">Header</th></tr> diff --git a/superkaramba/examples/test_all.sh b/superkaramba/examples/test_all.sh index 5e95063..cdf192d 100755 --- a/superkaramba/examples/test_all.sh +++ b/superkaramba/examples/test_all.sh @@ -10,7 +10,7 @@ themes=( "richtext/richtext.theme" "richtext/rtext.theme" "globalMouse/eyes.theme" - "unicode/unicode.theme" + "tqunicode/tqunicode.theme" "mouseDrag/karmix/karmix.theme" "input_api/input_api.theme" "input_example/input_example.theme" diff --git a/superkaramba/examples/unicode/unicode.py b/superkaramba/examples/unicode/unicode.py index 13d1136..1a15f83 100644 --- a/superkaramba/examples/unicode/unicode.py +++ b/superkaramba/examples/unicode/unicode.py @@ -1,6 +1,6 @@ #Unicode Example -#For Symbol Tables look at www.unicode.org/charts/ +#For Symbol Tables look at www.tqunicode.org/charts/ #this import statement allows access to the karamba functions @@ -31,8 +31,8 @@ def initWidget(widget): \u0631\u0632\u0633\u0634\u0635\u0636\u0637\u0638\u0639\u063A\u0641\u0642\u0643\u0644\u0645\u0646 \u0647\u0648\u064A <p> -For a complete reference on unicode caracter codes look at: -<center><a href="kfmclient openURL http://www.unicode.org/charts/">www.unicode.org/charts/</a></center> +For a complete reference on tqunicode caracter codes look at: +<center><a href="kfmclient openURL http://www.tqunicode.org/charts/">www.tqunicode.org/charts/</a></center> </p> """ karamba.resizeWidget(widget, 400, 400) diff --git a/superkaramba/src/datesensor.cpp b/superkaramba/src/datesensor.cpp index ca5e6e6..56c9d31 100644 --- a/superkaramba/src/datesensor.cpp +++ b/superkaramba/src/datesensor.cpp @@ -20,7 +20,7 @@ DateSensor::~DateSensor() void DateSensor::update() { - TQDateTime qdt = TQDateTime::currentDateTime(); + TQDateTime qdt = TQDateTime::tqcurrentDateTime(); 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->sizeHint().width(); - int h = cal->sizeHint().height(); + int w = cal->tqsizeHint().width(); + int h = cal->tqsizeHint().height(); // make calendar fully visible TQRect deskR = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(c)); diff --git a/superkaramba/src/disksensor.cpp b/superkaramba/src/disksensor.cpp index ea33c7c..b53c6e3 100644 --- a/superkaramba/src/disksensor.cpp +++ b/superkaramba/src/disksensor.cpp @@ -10,7 +10,7 @@ #include "disksensor.h" #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqstring.h> #include <tqregexp.h> #include <kprocess.h> diff --git a/superkaramba/src/disksensor.h b/superkaramba/src/disksensor.h index f73500e..0fb2023 100644 --- a/superkaramba/src/disksensor.h +++ b/superkaramba/src/disksensor.h @@ -12,7 +12,7 @@ #include "sensor.h" #include <tqmap.h> #include <tqstring.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqregexp.h> #include <tqstringlist.h> #include <kprocess.h> diff --git a/superkaramba/src/imagelabel_python.cpp b/superkaramba/src/imagelabel_python.cpp index 7cf6d73..9379201 100644 --- a/superkaramba/src/imagelabel_python.cpp +++ b/superkaramba/src/imagelabel_python.cpp @@ -61,7 +61,7 @@ ImageLabel* createImageLabel(karamba *theme, long x, long y, theme->meterList->append (tmp); theme->imageList->append (tmp); if(bg) - theme->kroot->repaint(true); + theme->kroot->tqrepaint(true); return tmp; } diff --git a/superkaramba/src/input.cpp b/superkaramba/src/input.cpp index eae8780..63290cc 100644 --- a/superkaramba/src/input.cpp +++ b/superkaramba/src/input.cpp @@ -35,7 +35,7 @@ Input::~Input() void Input::mUpdate(TQPainter*) { - edit->repaint(); + edit->tqrepaint(); } void Input::setValue(TQString text) @@ -131,7 +131,7 @@ void Input::setFontColor(TQColor fontColor) TQColor Input::getFontColor() const { - const TQColorGroup &color = edit->colorGroup(); + const TQColorGroup &color = edit->tqcolorGroup(); return color.text(); } @@ -144,7 +144,7 @@ void Input::setSelectionColor(TQColor selectionColor) TQColor Input::getSelectionColor() const { - const TQColorGroup &color = edit->colorGroup(); + const TQColorGroup &color = edit->tqcolorGroup(); return color.highlight(); } @@ -157,7 +157,7 @@ void Input::setSelectedTextColor(TQColor selectedTextColor) TQColor Input::getSelectedTextColor() const { - const TQColorGroup &color = edit->colorGroup(); + const TQColorGroup &color = edit->tqcolorGroup(); return color.highlightedText(); } diff --git a/superkaramba/src/input_python.cpp b/superkaramba/src/input_python.cpp index fb451bd..82ed00f 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)->focusWidget(); + TQWidget *obj = ((karamba*)widget)->tqfocusWidget(); 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 a7bdfba..90c58c0 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -85,7 +85,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, karambaApp->addKaramba(this, reloading); if(prettyName.isEmpty()) - prettyName = TQString("%1 - %2").arg(m_theme.name()).arg(m_instance); + prettyName = TQString("%1 - %2").tqarg(m_theme.name()).tqarg(m_instance); kdDebug() << "Starting theme: " << m_theme.name() << " pretty name: " << prettyName << endl; @@ -111,7 +111,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, // Creates KConfig Object TQString instanceString; if(m_instance > 1) - instanceString = TQString("-%1").arg(m_instance); + instanceString = TQString("-%1").tqarg(m_instance); TQString cfg = TQDir::home().absPath() + "/.superkaramba/" + m_theme.id() + instanceString + ".rc"; kdDebug() << cfg << endl; @@ -622,7 +622,7 @@ bool karamba::parseConfig() TQColor("white"))); defaultTextField->setFont(lineParser.getString("FONT", "Helvetica")); defaultTextField->setFontSize(lineParser.getInt("FONTSIZE", 12)); - defaultTextField->setAlignment(lineParser.getString("ALIGN", + defaultTextField->tqsetAlignment(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->setAlignment(lineParser.getString("ALIGN", + tmpText->tqsetAlignment(lineParser.getString("ALIGN", defTxt.getAlignmentAsString())); tmpText->setFixedPitch(lineParser.getInt("FIXEDPITCH", defTxt.getFixedPitch())); @@ -1619,13 +1619,13 @@ void karamba::updateBackground(KSharedPixmap* kpm) { systray->updateBackgroundPixmap(buffer2); } - repaint(); + tqrepaint(); } void karamba::currentDesktopChanged( int i ) { //qDebug("karamba::currentDesktopChanged"); - kroot->repaint( true ); + kroot->tqrepaint( true ); if (pythonIface && pythonIface->isExtensionLoaded()) pythonIface->desktopChanged(this, i); } @@ -1633,7 +1633,7 @@ void karamba::currentDesktopChanged( int i ) void karamba::currentWallpaperChanged(int i ) { //qDebug("karamba::currentWallpaperChanged"); - kroot->repaint( true ); + kroot->tqrepaint( true ); if (pythonIface && pythonIface->isExtensionLoaded()) pythonIface->wallpaperChanged(this, i); } @@ -1660,7 +1660,7 @@ void karamba::externalStep() p.end(); bitBlt(&pm,0,0,&buffer,0,TQt::CopyROP); - repaint(); + tqrepaint(); } } diff --git a/superkaramba/src/karamba_python.cpp b/superkaramba/src/karamba_python.cpp index 9f09f79..1538672 100644 --- a/superkaramba/src/karamba_python.cpp +++ b/superkaramba/src/karamba_python.cpp @@ -125,8 +125,8 @@ static PyMethodDef karamba_methods[] = { {(char*)"getTextColor", py_getTextColor, METH_VARARGS, (char*)"Get a Text Sensor's Color"}, {(char*)"changeTextSize", py_setTextFontSize, METH_VARARGS, (char*)"Change a Text Sensor's Font Size"}, {(char*)"getTextFontSize", py_getTextFontSize, METH_VARARGS, (char*)"Get a Text Sensor's Font Size"}, - {(char*)"getTextAlign", py_getTextAlign, METH_VARARGS, (char*)"Get Text alignment."}, - {(char*)"setTextAlign", py_setTextAlign, METH_VARARGS, (char*)"Set Text alignment."}, + {(char*)"getTextAlign", py_getTextAlign, METH_VARARGS, (char*)"Get Text tqalignment."}, + {(char*)"setTextAlign", py_setTextAlign, METH_VARARGS, (char*)"Set Text tqalignment."}, {(char*)"setTextScroll", py_setTextScroll, METH_VARARGS, (char*)"Set Text scroll."}, // RichTextLabel - richtextlabel_python.cpp @@ -214,7 +214,7 @@ static PyMethodDef karamba_methods[] = { {(char*)"showSystray", py_show_systray, METH_VARARGS, (char*)"Show the Systray"}, {(char*)"moveSystray", py_move_systray, METH_VARARGS, (char*)"Move the Systray"}, {(char*)"getCurrentWindowCount", py_get_current_window_count, METH_VARARGS, (char*)"Get current Window count"}, - {(char*)"updateSystrayLayout", py_update_systray_layout, METH_VARARGS, (char*)"Update Systray layout"}, + {(char*)"updateSystrayLayout", py_update_systray_layout, METH_VARARGS, (char*)"Update Systray tqlayout"}, // Misc - misc_python.cpp {(char*)"getThemePath", py_get_theme_path, METH_VARARGS, (char*)"Get the file path of the theme"}, diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp index f3231b2..87f6e60 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::allWidgets(); + TQWidgetList *list = TQApplication::tqallWidgets(); 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 5d33f68..659370a 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::allWidgets(); + TQWidgetList *list = TQApplication::tqallWidgets(); 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::allWidgets(); + TQWidgetList *list = TQApplication::tqallWidgets(); 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 a6cd2c3..74ce4ed 100644 --- a/superkaramba/src/karambasessionmanaged.cpp +++ b/superkaramba/src/karambasessionmanaged.cpp @@ -34,7 +34,7 @@ bool KarambaSessionManaged::saveState(TQSessionManager&) TQString openThemes=""; - TQWidgetList *list = TQApplication::allWidgets(); + TQWidgetList *list = TQApplication::tqallWidgets(); TQWidgetListIt it( *list ); // iterate over the widgets TQWidget * w; while ( (w=it.current()) != 0 ) // for each widget... diff --git a/superkaramba/src/memsensor.cpp b/superkaramba/src/memsensor.cpp index bbf2edf..dda7983 100644 --- a/superkaramba/src/memsensor.cpp +++ b/superkaramba/src/memsensor.cpp @@ -10,7 +10,7 @@ #include "memsensor.h" #include <tqfile.h> #include <tqglobal.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqstring.h> #include <tqregexp.h> diff --git a/superkaramba/src/programsensor.h b/superkaramba/src/programsensor.h index 85c7e88..93e1c9e 100644 --- a/superkaramba/src/programsensor.h +++ b/superkaramba/src/programsensor.h @@ -15,7 +15,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <tqvaluevector.h> -#include <textcodec.h> +#include <tqtextcodec.h> class ProgramSensor : public Sensor { Q_OBJECT diff --git a/superkaramba/src/richtextlabel.cpp b/superkaramba/src/richtextlabel.cpp index 999fe0f..5044161 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->colorGroup()), + colorGrp(k->tqcolorGroup()), 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->colorGroup()), + colorGrp(k->tqcolorGroup()), underlineLinks(false) { kdDebug() << k_funcinfo << x << ", " << y << ", " << w << ", " << h << endl; diff --git a/superkaramba/src/rsssensor.h b/superkaramba/src/rsssensor.h index 48f08e4..4e2322b 100644 --- a/superkaramba/src/rsssensor.h +++ b/superkaramba/src/rsssensor.h @@ -13,7 +13,7 @@ #include <sensor.h> #include <tqstring.h> -#include <textcodec.h> +#include <tqtextcodec.h> /** * diff --git a/superkaramba/src/sensorsensor.h b/superkaramba/src/sensorsensor.h index 83a89ab..217cefb 100644 --- a/superkaramba/src/sensorsensor.h +++ b/superkaramba/src/sensorsensor.h @@ -3,7 +3,7 @@ #define SENSORSENSOR_H #include <tqstring.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqmap.h> #include <tqstringlist.h> #include <tqregexp.h> diff --git a/superkaramba/src/sklineedit.cpp b/superkaramba/src/sklineedit.cpp index 57b9db0..40b6d3e 100644 --- a/superkaramba/src/sklineedit.cpp +++ b/superkaramba/src/sklineedit.cpp @@ -46,13 +46,13 @@ void SKLineEdit::drawContents(TQPainter *p) void SKLineEdit::setFrameColor(TQColor c) { frameColor = c; - repaint(); + tqrepaint(); } void SKLineEdit::setBackgroundColor(TQColor c) { TQLineEdit::setBackgroundColor(c); - repaint(); + tqrepaint(); } TQColor SKLineEdit::getFrameColor() const diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp index bf3cf81..3e0d4ba 100644 --- a/superkaramba/src/systemtray.cpp +++ b/superkaramba/src/systemtray.cpp @@ -29,7 +29,7 @@ #include <tqpopupmenu.h> #include <tqdragobject.h> -#include <layout.h> +#include <tqlayout.h> #include <tqstringlist.h> #include <tqpixmap.h> @@ -190,7 +190,7 @@ void Systemtray::layoutSystray() } count++; - emb->repaint(); + emb->tqrepaint(); } } diff --git a/superkaramba/src/textfield.cpp b/superkaramba/src/textfield.cpp index 4b1cee2..a3be722 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"); - setAlignment(TQt::AlignLeft); + tqsetAlignment(TQt::AlignLeft); setFixedPitch(false); setShadow(0); } @@ -35,7 +35,7 @@ TextField::TextField( const TextField& def ) setBGColor(def.getBGColor()); setFont( def.getFont() ); - setAlignment( def.getAlignment() ); + tqsetAlignment( def.getAlignment() ); setFixedPitch( def.getFixedPitch() ); setShadow( def.getShadow() ); } @@ -51,7 +51,7 @@ TextField& TextField::operator=(const TextField& rhs) setBGColor(rhs.getBGColor()); setFont( rhs.getFont() ); - setAlignment( rhs.getAlignment() ); + tqsetAlignment( rhs.getAlignment() ); setFixedPitch( rhs.getFixedPitch() ); setShadow( rhs.getShadow() ); @@ -102,32 +102,32 @@ int TextField::getFontSize() const return font.pointSize(); } -void TextField::setAlignment( const TQString &align ) +void TextField::tqsetAlignment( const TQString &align ) { TQString a = align.upper(); if( a == "LEFT" || a.isEmpty() ) - alignment = TQt::AlignLeft; + tqalignment = TQt::AlignLeft; if( a == "RIGHT" ) - alignment = TQt::AlignRight; + tqalignment = TQt::AlignRight; if( a == "CENTER" ) - alignment = TQt::AlignHCenter; + tqalignment = TQt::AlignHCenter; } -void TextField::setAlignment( int af ) +void TextField::tqsetAlignment( int af ) { - alignment = af; + tqalignment = af; } int TextField::getAlignment() const { - return alignment; + return tqalignment; } TQString TextField::getAlignmentAsString() const { - if( alignment == TQt::AlignHCenter ) + if( tqalignment == TQt::AlignHCenter ) return "CENTER"; - else if( alignment == TQt::AlignRight ) + else if( tqalignment == TQt::AlignRight ) return "RIGHT"; else return "LEFT"; diff --git a/superkaramba/src/textfield.h b/superkaramba/src/textfield.h index 13177b7..34f17c3 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 setAlignment( int ); - void setAlignment( const TQString& ); + void tqsetAlignment( int ); + void tqsetAlignment( const TQString& ); void setFixedPitch( bool ); void setShadow( int ); @@ -47,7 +47,7 @@ public: int getLineHeight() const; protected: - int alignment; + int tqalignment; TQFont font; TQColor color; TQColor bgColor; diff --git a/superkaramba/src/textfilesensor.h b/superkaramba/src/textfilesensor.h index 3d35211..adf521e 100644 --- a/superkaramba/src/textfilesensor.h +++ b/superkaramba/src/textfilesensor.h @@ -25,9 +25,9 @@ #include <sensor.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqstring.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include <tqvaluevector.h> /** * diff --git a/superkaramba/src/textlabel.cpp b/superkaramba/src/textlabel.cpp index 09b8f98..0cf8891 100644 --- a/superkaramba/src/textlabel.cpp +++ b/superkaramba/src/textlabel.cpp @@ -13,7 +13,7 @@ #include "textlabel.h" TextLabel::TextLabel(karamba *k, int x,int y,int w,int h): - Meter(k, x,y,w,h), alignment(TQt::AlignLeft), clip(0), bgColor(0, 0, 0), + Meter(k, x,y,w,h), tqalignment(TQt::AlignLeft), clip(0), bgColor(0, 0, 0), lineHeight(0), shadow(0), scrollSpeed(0, 0), scrollPos(0, 0), scrollGap(0), scrollPause(0), pauseCounter(0), scrollType(ScrollNone) { @@ -31,7 +31,7 @@ TextLabel::TextLabel(karamba *k, int x,int y,int w,int h): } TextLabel::TextLabel(karamba *k): - Meter(k, 0, 0, 0, 0), alignment(TQt::AlignLeft), clip(0), bgColor(0, 0, 0), + Meter(k, 0, 0, 0, 0), tqalignment(TQt::AlignLeft), clip(0), bgColor(0, 0, 0), lineHeight(0), shadow(0), scrollSpeed(0, 0), scrollPos(0, 0), scrollGap(0), scrollPause(0), pauseCounter(0), scrollType(ScrollNone) { @@ -60,7 +60,7 @@ void TextLabel::setTextProps( TextField* t ) text = *t; //lineHeight = t->getLineHeight(); shadow = t->getShadow(); - alignment = t->getAlignment(); + tqalignment = t->getAlignment(); setFontSize(t->getFontSize()); setFont(t->getFont()); @@ -131,22 +131,22 @@ int TextLabel::getFontSize() const return font.pixelSize(); } -void TextLabel::setAlignment( TQString align ) +void TextLabel::tqsetAlignment( TQString align ) { TQString a = align.upper(); if( a == "LEFT" || a.isEmpty() ) - alignment = TQt::AlignLeft; + tqalignment = TQt::AlignLeft; if( a == "RIGHT" ) - alignment = TQt::AlignRight; + tqalignment = TQt::AlignRight; if( a == "CENTER" ) - alignment = TQt::AlignHCenter; + tqalignment = TQt::AlignHCenter; } TQString TextLabel::getAlignment() const { - if( alignment == TQt::AlignHCenter ) + if( tqalignment == TQt::AlignHCenter ) return "CENTER"; - else if( alignment == TQt::AlignRight ) + else if( tqalignment == TQt::AlignRight ) return "RIGHT"; else return "LEFT"; @@ -228,10 +228,10 @@ int TextLabel::drawText(TQPainter *p, int x, int y, int width, int height, { p->setPen(getBGColor()); p->drawText(x + shadow, y + shadow, width, height, - alignment | clip | TQt::ExpandTabs, text); + tqalignment | clip | TQt::ExpandTabs, text); } p->setPen(getColor()); - p->drawText(x, y, width, height, alignment | clip | TQt::ExpandTabs, text); + p->drawText(x, y, width, height, tqalignment | clip | TQt::ExpandTabs, text); return 0; } diff --git a/superkaramba/src/textlabel.h b/superkaramba/src/textlabel.h index 72fcbc9..b29c44e 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 setAlignment( TQString ); + void tqsetAlignment( TQString ); void setFixedPitch( bool ); void setShadow( int ); void mUpdate( TQPainter * ); @@ -62,7 +62,7 @@ public: virtual bool click(TQMouseEvent*); private: - int alignment; + int tqalignment; int clip; TQStringList value; TQFont font; diff --git a/superkaramba/src/textlabel_python.cpp b/superkaramba/src/textlabel_python.cpp index 3cf6e3e..e7d2498 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)->setAlignment( text ); + ((TextLabel*)textSensor)->tqsetAlignment( text ); return Py_BuildValue((char*)"l", 1); } diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp index acff61f..0e420d2 100644 --- a/superkaramba/src/themefile.cpp +++ b/superkaramba/src/themefile.cpp @@ -32,7 +32,7 @@ #include <kstandarddirs.h> #include <klocale.h> #include <kio/netaccess.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqfileinfo.h> #include <tqdom.h> #include <tqdir.h> @@ -213,7 +213,7 @@ bool ThemeFile::set(const KURL &url) i18n("You are about to install and run %1 SuperKaramba theme. Since " "themes can contain executable code you should only install themes " "from sources that you trust. Continue?"), i18n("Executable Code Warning"), i18n("Install") - .arg(url.prettyURL())) + .tqarg(url.prettyURL())) == KMessageBox::Cancel) { return false; @@ -226,7 +226,7 @@ bool ThemeFile::set(const KURL &url) { if(KMessageBox::warningContinueCancel(TQT_TQWIDGET(kapp->activeWindow()), i18n("%1 already exists. Do you want to overwrite it?") - .arg(localFile.filePath()),i18n("File Exists"),i18n("Overwrite")) + .tqarg(localFile.filePath()),i18n("File Exists"),i18n("Overwrite")) == KMessageBox::Cancel) { return false; diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp index 37c72b7..bc388c2 100644 --- a/superkaramba/src/themelocale.cpp +++ b/superkaramba/src/themelocale.cpp @@ -157,7 +157,7 @@ void ThemeLocale::setLanguage(const TQStringList &languages) ++it) { TQString file = - TQString("locale/%1/LC_MESSAGES/%2.mo").arg(*it).arg(m_theme->mo()); + TQString("locale/%1/LC_MESSAGES/%2.mo").tqarg(*it).tqarg(m_theme->mo()); if(m_theme->fileExists(file)) { diff --git a/superkaramba/src/themes_layout.ui b/superkaramba/src/themes_layout.ui index 8b76e0b..b3ee3a1 100644 --- a/superkaramba/src/themes_layout.ui +++ b/superkaramba/src/themes_layout.ui @@ -12,7 +12,7 @@ <height>517</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -122,7 +122,7 @@ <property name="name"> <cstring>buttonAddToDesktop</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -139,7 +139,7 @@ <property name="name"> <cstring>buttonClose</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp index f483a04..f7749cc 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::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml")); + TQString::tqfromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml")); config->sync(); - m_newStuffStatus = config->entryMap("KNewStuffStatus").keys(); + m_newStufftqStatus = 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_newStuffStatus.begin(); - it != m_newStuffStatus.end(); ++it) + for(TQStringList::Iterator it = m_newStufftqStatus.begin(); + it != m_newStufftqStatus.end(); ++it) { keys.remove(*it); } @@ -477,7 +477,7 @@ void ThemesDlg::uninstall() tableThemes->removeItem( twPtr ); } #ifdef HAVE_KNEWSTUFF - // Remove theme from KNewStuffStatus + // Remove theme from KNewStufftqStatus 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 KNewStuffStatus + // Remove theme from KNewStufftqStatus 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 b75c820..bf4fab5 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_newStuffStatus; + TQStringList m_newStufftqStatus; #endif }; diff --git a/superkaramba/src/themewidget.cpp b/superkaramba/src/themewidget.cpp index 75a9a0d..3addd2a 100644 --- a/superkaramba/src/themewidget.cpp +++ b/superkaramba/src/themewidget.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <klocale.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> ThemeWidget::ThemeWidget(TQWidget *parent, const char *name) : ThemeWidgetLayout(parent, name), m_themeFile(0) @@ -75,7 +75,7 @@ void ThemeWidget::updateRunning() { int i = instances(); if(i > 0) - running->setText(i18n("<p align=\"center\">%1 running</p>").arg(i)); + running->setText(i18n("<p align=\"center\">%1 running</p>").tqarg(i)); else running->setText(""); } @@ -101,12 +101,12 @@ void ThemeWidget::showButton(bool show) void ThemeWidget::setDescriptionMaxHeight() { - if(layoutText->geometry().height() <= 0) + if(layoutText->tqgeometry().height() <= 0) return; - int height = layoutText->geometry().height() - themeName->height() - + int height = layoutText->tqgeometry().height() - themeName->height() - layoutText->spacing(); if(buttonGo->isVisible()) - height -= layoutButton->geometry().height() + layoutText->spacing(); + height -= layoutButton->tqgeometry().height() + layoutText->spacing(); description->setMaximumHeight(height); } diff --git a/superkaramba/src/themewidget_layout.ui b/superkaramba/src/themewidget_layout.ui index 6e07e26..5ab1b70 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="minimumSize"> + <property name="tqminimumSize"> <size> <width>76</width> <height>0</height> @@ -47,7 +47,7 @@ <property name="pixmap"> <pixmap>image0</pixmap> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -121,7 +121,7 @@ <property name="text"> <string>Description</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -143,7 +143,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> diff --git a/superkaramba/src/uptimesensor.h b/superkaramba/src/uptimesensor.h index 7cef09b..5459956 100644 --- a/superkaramba/src/uptimesensor.h +++ b/superkaramba/src/uptimesensor.h @@ -12,7 +12,7 @@ #include "sensor.h" #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqstring.h> #include <tqregexp.h> #include <tqdatetime.h> diff --git a/superkaramba/src/widget_python.cpp b/superkaramba/src/widget_python.cpp index 0948e39..564b4b4 100644 --- a/superkaramba/src/widget_python.cpp +++ b/superkaramba/src/widget_python.cpp @@ -101,7 +101,7 @@ PyObject* py_create_widget_mask(PyObject *, PyObject *args) long redrawWidgetBackground(long widget) { karamba* currTheme = (karamba*)widget; - currTheme->kroot->repaint(true); + currTheme->kroot->tqrepaint(true); return 1; } diff --git a/superkaramba/src/xmmssensor.cpp b/superkaramba/src/xmmssensor.cpp index 268700b..d78d119 100644 --- a/superkaramba/src/xmmssensor.cpp +++ b/superkaramba/src/xmmssensor.cpp @@ -164,9 +164,9 @@ void XMMSSensor::update() { isPlaying = xmms->isPlaying(0); pos = xmms->getPlaylistPos(0); - qDebug("unicode start"); + qDebug("tqunicode start"); title = codec->toUnicode( TQCString( xmms->getPlaylistTitle( 0, pos ) ) ); - qDebug("unicode end"); + qDebug("tqunicode end"); if( title.isEmpty() ) title = "XMMS"; diff --git a/superkaramba/src/xmmssensor.h b/superkaramba/src/xmmssensor.h index 4612d5f..bd254fb 100644 --- a/superkaramba/src/xmmssensor.h +++ b/superkaramba/src/xmmssensor.h @@ -16,7 +16,7 @@ #include <tqdatetime.h> #include <tqregexp.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include "sensor.h" |