diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 625904bd3097f9749450428904ca14ff2531824d (patch) | |
| tree | a45c43d5de71cb720078fa1272a4339815a919be | |
| parent | 6335dc55802871b5a43492f217b6edbb420204c4 (diff) | |
| download | tdeutils-625904bd3097f9749450428904ca14ff2531824d.tar.gz tdeutils-625904bd3097f9749450428904ca14ff2531824d.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
396 files changed, 1347 insertions, 1347 deletions
diff --git a/ark/arch.cpp b/ark/arch.cpp index 9b9aa00..5ff9a61 100644 --- a/ark/arch.cpp +++ b/ark/arch.cpp @@ -390,37 +390,37 @@ bool Arch::processLine( const TQCString &line ) Arch *Arch::archFactory( ArchType aType, - ArkWidget *tqparent, const TQString &filename, + ArkWidget *parent, const TQString &filename, const TQString &openAsMimeType ) { switch( aType ) { case TAR_FORMAT: - return new TarArch( tqparent, filename, openAsMimeType ); + return new TarArch( parent, filename, openAsMimeType ); case ZIP_FORMAT: - return new ZipArch( tqparent, filename ); + return new ZipArch( parent, filename ); case LHA_FORMAT: - return new LhaArch( tqparent, filename ); + return new LhaArch( parent, filename ); case COMPRESSED_FORMAT: - return new CompressedFile( tqparent, filename, openAsMimeType ); + return new CompressedFile( parent, filename, openAsMimeType ); case ZOO_FORMAT: - return new ZooArch( tqparent, filename ); + return new ZooArch( parent, filename ); case RAR_FORMAT: - return new RarArch( tqparent, filename ); + return new RarArch( parent, filename ); case AA_FORMAT: - return new ArArch( tqparent, filename ); + return new ArArch( parent, filename ); case SEVENZIP_FORMAT: - return new SevenZipArch( tqparent, filename ); + return new SevenZipArch( parent, filename ); case ACE_FORMAT: - return new AceArch( tqparent, filename ); + return new AceArch( parent, filename ); case UNKNOWN_FORMAT: default: @@ -147,7 +147,7 @@ class Arch : public TQObject void clearShellOutput() { m_lastShellOutput.truncate( 0 ); } const TQString& getLastShellOutput() const { return m_lastShellOutput; } - static Arch *archFactory( ArchType aType, ArkWidget *tqparent, + static Arch *archFactory( ArchType aType, ArkWidget *parent, const TQString &filename, const TQString &openAsMimeType = TQString() ); diff --git a/ark/archiveformatdlg.cpp b/ark/archiveformatdlg.cpp index 68c0d3f..18f4102 100644 --- a/ark/archiveformatdlg.cpp +++ b/ark/archiveformatdlg.cpp @@ -28,8 +28,8 @@ #include <tqlabel.h> #include <tqvbox.h> -ArchiveFormatDlg::ArchiveFormatDlg( TQWidget * tqparent, const TQString & defaultType ) - :KDialogBase( tqparent, "archiveformatdialog", true, +ArchiveFormatDlg::ArchiveFormatDlg( TQWidget * parent, const TQString & defaultType ) + :KDialogBase( parent, "archiveformatdialog", true, i18n( "Choose Archive Format" ), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok), m_combo( 0 ) diff --git a/ark/archiveformatdlg.h b/ark/archiveformatdlg.h index 1a1cefa..d87da74 100644 --- a/ark/archiveformatdlg.h +++ b/ark/archiveformatdlg.h @@ -30,7 +30,7 @@ class ArchiveFormatDlg: public KDialogBase Q_OBJECT TQ_OBJECT public: - ArchiveFormatDlg( TQWidget * tqparent, const TQString & defaultType ); + ArchiveFormatDlg( TQWidget * parent, const TQString & defaultType ); TQString mimeType(); private: diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index ca6c24c..20ac169 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -63,9 +63,9 @@ KAboutData *ArkPart::createAboutData() -ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject *tqparent, +ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject *parent, const char *name, const TQStringList &, bool readWrite ) - : KParts::ReadWritePart(tqparent, name) + : KParts::ReadWritePart(parent, name) { kdDebug(1601)<<"ArkPart::ArkPart"<<endl; setInstance(ArkFactory::instance()); @@ -372,8 +372,8 @@ void ArkPart::cancelTransfer() } } -ArkBrowserExtension::ArkBrowserExtension( KParts::ReadOnlyPart * tqparent, const char * name ) - : KParts::BrowserExtension( tqparent, name ) +ArkBrowserExtension::ArkBrowserExtension( KParts::ReadOnlyPart * parent, const char * name ) + : KParts::BrowserExtension( parent, name ) { } @@ -382,8 +382,8 @@ void ArkBrowserExtension::slotOpenURLRequested( const KURL & url ) emit openURLRequest( url, KParts::URLArgs() ); } -ArkStatusBarExtension::ArkStatusBarExtension( KParts::ReadWritePart * tqparent ) - : KParts::StatusBarExtension( tqparent ), +ArkStatusBarExtension::ArkStatusBarExtension( KParts::ReadWritePart * parent ) + : KParts::StatusBarExtension( parent ), m_bBusy( false ), m_pStatusLabelSelect( 0 ), m_pStatusLabelTotal( 0 ), diff --git a/ark/ark_part.h b/ark/ark_part.h index 5cbd758..ac5a8bd 100644 --- a/ark/ark_part.h +++ b/ark/ark_part.h @@ -48,7 +48,7 @@ class ArkBrowserExtension: public KParts::BrowserExtension Q_OBJECT TQ_OBJECT public: - ArkBrowserExtension( KParts::ReadOnlyPart * tqparent, const char * name = 0L ); + ArkBrowserExtension( KParts::ReadOnlyPart * parent, const char * name = 0L ); public slots: void slotOpenURLRequested( const KURL & url ); }; @@ -58,7 +58,7 @@ class ArkStatusBarExtension: public KParts::StatusBarExtension Q_OBJECT TQ_OBJECT public: - ArkStatusBarExtension( KParts::ReadWritePart * tqparent ); + ArkStatusBarExtension( KParts::ReadWritePart * parent ); ~ArkStatusBarExtension(); void setProgress( unsigned long progress ); @@ -90,7 +90,7 @@ class ArkPart: public KParts::ReadWritePart Q_OBJECT TQ_OBJECT public: - ArkPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, + ArkPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList &, bool readWrite ); virtual ~ArkPart(); diff --git a/ark/arkapp.h b/ark/arkapp.h index 71cd573..dc376e9 100644 --- a/ark/arkapp.h +++ b/ark/arkapp.h @@ -79,7 +79,7 @@ class ArkApplication : public KUniqueApplication ArkApplication(); private: - TQWidget *m_mainwidget; // to be the tqparent of all ArkWidgets + TQWidget *m_mainwidget; // to be the parent of all ArkWidgets int m_windowCount; TQStringList openArksList; diff --git a/ark/arkfactory.cpp b/ark/arkfactory.cpp index a511f63..3e17e7a 100644 --- a/ark/arkfactory.cpp +++ b/ark/arkfactory.cpp @@ -39,7 +39,7 @@ ArkFactory::~ArkFactory() } KParts::Part * ArkFactory::createPartObject( TQWidget *parentWidget, - const char *widgetName, TQObject *tqparent, + const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { @@ -49,7 +49,7 @@ KParts::Part * ArkFactory::createPartObject( TQWidget *parentWidget, { readWrite = true; } - ArkPart* obj = new ArkPart( parentWidget, widgetName, tqparent, name, + ArkPart* obj = new ArkPart( parentWidget, widgetName, parent, name, args, readWrite ); //kdDebug( 1601 ) << "classname is: " << TQCString( classname ) << endl; return obj; diff --git a/ark/arkfactory.h b/ark/arkfactory.h index d9021b6..2b5514b 100644 --- a/ark/arkfactory.h +++ b/ark/arkfactory.h @@ -30,7 +30,7 @@ public: virtual ~ArkFactory(); virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0,const char *widgetName = 0, - TQObject *tqparent = 0, const char *name = 0, + TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ); static KInstance* instance(); diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp index 1e70ce5..b2ae335 100644 --- a/ark/arkviewer.cpp +++ b/ark/arkviewer.cpp @@ -36,8 +36,8 @@ #include <tqurl.h> -ArkViewer::ArkViewer( TQWidget * tqparent, const char * name ) - : KDialogBase( tqparent, name, false, TQString(), Close ), m_part( 0 ) +ArkViewer::ArkViewer( TQWidget * parent, const char * name ) + : KDialogBase( parent, name, false, TQString(), Close ), m_part( 0 ) { m_widget = new TQVBox( this ); m_widget->tqlayout()->setSpacing( 10 ); diff --git a/ark/arkviewer.h b/ark/arkviewer.h index c601eab..70a09d5 100644 --- a/ark/arkviewer.h +++ b/ark/arkviewer.h @@ -31,7 +31,7 @@ class ArkViewer : public KDialogBase TQ_OBJECT public: - ArkViewer( TQWidget* tqparent = 0, const char * name = 0 ); + ArkViewer( TQWidget* parent = 0, const char * name = 0 ); ~ArkViewer(); bool view( const KURL& filename ); diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index f070d4d..a83cb14 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -81,7 +81,7 @@ #include "searchbar.h" #include "arkviewer.h" -static void viewInExternalViewer( ArkWidget* tqparent, const KURL& filename ) +static void viewInExternalViewer( ArkWidget* parent, const KURL& filename ) { TQString mimetype = KMimeType::findByURL( filename )->name(); bool view = true; @@ -89,7 +89,7 @@ static void viewInExternalViewer( ArkWidget* tqparent, const KURL& filename ) if ( KRun::isExecutable( mimetype ) ) { TQString text = i18n( "The file you're trying to view may be an executable. Running untrusted executables may compromise your system's security.\nAre you sure you want to run that file?" ); - view = ( KMessageBox::warningContinueCancel( tqparent, text, TQString(), i18n("Run Nevertheless") ) == KMessageBox::Continue ); + view = ( KMessageBox::warningContinueCancel( parent, text, TQString(), i18n("Run Nevertheless") ) == KMessageBox::Continue ); } if ( view ) @@ -103,8 +103,8 @@ static void viewInExternalViewer( ArkWidget* tqparent, const KURL& filename ) // //---------------------------------------------------------------------- -ArkWidget::ArkWidget( TQWidget *tqparent, const char *name ) - : TQVBox(tqparent, name), m_bBusy( false ), m_bBusyHold( false ), +ArkWidget::ArkWidget( TQWidget *parent, const char *name ) + : TQVBox(parent, name), m_bBusy( false ), m_bBusyHold( false ), m_extractOnly( false ), m_extractRemote(false), m_openAsMimeType(TQString()), m_pTempAddList(NULL), m_bArchivePopupEnabled( false ), diff --git a/ark/arkwidget.h b/ark/arkwidget.h index 1ea203f..f174f9c 100644 --- a/ark/arkwidget.h +++ b/ark/arkwidget.h @@ -61,7 +61,7 @@ class ArkWidget : public TQVBox Q_OBJECT TQ_OBJECT public: - ArkWidget( TQWidget *tqparent=0, const char *name=0 ); + ArkWidget( TQWidget *parent=0, const char *name=0 ); virtual ~ArkWidget(); bool isArchiveOpen() const { return m_bIsArchiveOpen; } diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp index 87df006..923f108 100644 --- a/ark/extractiondialog.cpp +++ b/ark/extractiondialog.cpp @@ -51,12 +51,12 @@ #include "arkutils.h" #include "settings.h" -ExtractionDialog::ExtractionDialog( TQWidget *tqparent, const char *name, +ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name, bool enableSelected, const KURL& defaultExtractionDir, const TQString &prefix, const TQString &archiveName ) - : KDialogBase( tqparent, name, true, i18n( "Extract" ), Ok | Cancel, Ok ), + : KDialogBase( parent, name, true, i18n( "Extract" ), Ok | Cancel, Ok ), m_selectedButton( 0 ), m_allButton( 0 ), m_selectedOnly( enableSelected ), m_extractionDirectory( defaultExtractionDir ), m_defaultExtractionDir( defaultExtractionDir.prettyURL() ), m_prefix( prefix ) diff --git a/ark/extractiondialog.h b/ark/extractiondialog.h index b881770..0fc3100 100644 --- a/ark/extractiondialog.h +++ b/ark/extractiondialog.h @@ -46,7 +46,7 @@ class ExtractionDialog : public KDialogBase /** * Constructor. */ - ExtractionDialog( TQWidget *tqparent = 0, const char *name = 0, + ExtractionDialog( TQWidget *parent = 0, const char *name = 0, bool enableSelected = true, const KURL &defaultExtractionDir = KURL(), const TQString &prefix = TQString(), diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp index a4e2f02..5aa1122 100644 --- a/ark/filelistview.cpp +++ b/ark/filelistview.cpp @@ -170,9 +170,9 @@ void FileLVI::setText( int column, const TQString &text ) TQListViewItem::setText(column, text); } -static FileLVI* folderLVI( KListViewItem *tqparent, const TQString& name ) +static FileLVI* folderLVI( KListViewItem *parent, const TQString& name ) { - FileLVI *folder = new FileLVI( tqparent ); + FileLVI *folder = new FileLVI( parent ); folder->setText( 0, name ); @@ -181,9 +181,9 @@ static FileLVI* folderLVI( KListViewItem *tqparent, const TQString& name ) return folder; } -static FileLVI* folderLVI( KListView *tqparent, const TQString& name ) +static FileLVI* folderLVI( KListView *parent, const TQString& name ) { - FileLVI *folder = new FileLVI( tqparent ); + FileLVI *folder = new FileLVI( parent ); folder->setText( 0, name ); folder->setPixmap( 0, KMimeType::mimeType( "inode/directory" )->pixmap( KIcon::Small ) ); return folder; @@ -194,8 +194,8 @@ static FileLVI* folderLVI( KListView *tqparent, const TQString& name ) ///////////////////////////////////////////////////////////////////// -FileListView::FileListView(TQWidget *tqparent, const char* name) - : KListView(tqparent, name) +FileListView::FileListView(TQWidget *parent, const char* name) + : KListView(parent, name) { TQWhatsThis::add( this, i18n( "This area is for displaying information about the files contained within an archive." ) @@ -274,14 +274,14 @@ TQStringList FileListView::selectedFilenames() * 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 tqparent, and so on. + * the next item is the next sibling of its parent, and so on. */ FileLVI *nitem = static_cast<FileLVI*>( item->nextSibling() ); - while ( !nitem && item->tqparent() ) + while ( !nitem && item->parent() ) { - item = static_cast<FileLVI*>( item->tqparent() ); - if ( item->tqparent() ) - nitem = static_cast<FileLVI*>( item->tqparent()->nextSibling() ); + item = static_cast<FileLVI*>( item->parent() ); + if ( item->parent() ) + nitem = static_cast<FileLVI*>( item->parent()->nextSibling() ); } item = nitem; continue; @@ -385,9 +385,9 @@ FileListView::item(const TQString& filename) const void FileListView::addItem( const TQStringList & entries ) { - FileLVI *flvi, *tqparent = findParent( entries[0] ); - if ( tqparent ) - flvi = new FileLVI( tqparent ); + FileLVI *flvi, *parent = findParent( entries[0] ); + if ( parent ) + flvi = new FileLVI( parent ); else flvi = new FileLVI( this ); @@ -508,7 +508,7 @@ FileLVI* FileListView::findParent( const TQString& fullname ) name = name.left( name.length() -1 ); if ( name.startsWith( "/" ) ) name = name.mid( 1 ); - // Checks if this entry needs a tqparent + // Checks if this entry needs a parent if ( !name.contains( '/' ) ) return static_cast< FileLVI* >( 0 ); @@ -538,8 +538,8 @@ FileLVI* FileListView::findParent( const TQString& fullname ) { TQString name = ancestorList[0]; - FileLVI *tqparent = static_cast< FileLVI*>( item ); - item = tqparent->firstChild(); + FileLVI *parent = static_cast< FileLVI*>( item ); + item = parent->firstChild(); while ( item ) { if ( item->text(0) == name ) @@ -549,7 +549,7 @@ FileLVI* FileListView::findParent( const TQString& fullname ) if ( !item ) { - item = folderLVI( tqparent, name ); + item = folderLVI( parent, name ); } ancestorList.pop_front(); @@ -559,12 +559,12 @@ FileLVI* FileListView::findParent( const TQString& fullname ) return static_cast< FileLVI* >( item ); } -TQStringList FileListView::tqchildrenOf( FileLVI* tqparent ) +TQStringList FileListView::tqchildrenOf( FileLVI* parent ) { - Q_ASSERT( tqparent ); + Q_ASSERT( parent ); TQStringList tqchildren; - FileLVI *item = static_cast<FileLVI*>( tqparent->firstChild() ); + FileLVI *item = static_cast<FileLVI*>( parent->firstChild() ); while ( item ) { diff --git a/ark/filelistview.h b/ark/filelistview.h index e2546e5..7605e01 100644 --- a/ark/filelistview.h +++ b/ark/filelistview.h @@ -76,7 +76,7 @@ class FileListView: public KListView Q_OBJECT TQ_OBJECT public: - FileListView( TQWidget *tqparent = 0, const char* name = 0 ); + FileListView( TQWidget *parent = 0, const char* name = 0 ); FileLVI *currentItem() {return ((FileLVI *) KListView::currentItem());} @@ -153,7 +153,7 @@ class FileListView: public KListView private: FileLVI* findParent( const TQString& fullname ); - TQStringList tqchildrenOf( FileLVI* tqparent ); + TQStringList tqchildrenOf( FileLVI* parent ); TQMap<int, columnName> m_columnMap; bool m_pressed; diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 6434bca..8541e1a 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -45,7 +45,7 @@ #include "archiveformatinfo.h" #include "arkwidget.h" -MainWindow::MainWindow( TQWidget * /*tqparent*/, const char *name ) +MainWindow::MainWindow( TQWidget * /*parent*/, const char *name ) : KParts::MainWindow(), progressDialog( 0 ) { setXMLFile( "arkui.rc" ); diff --git a/ark/mainwindow.h b/ark/mainwindow.h index 28989c0..e620b40 100644 --- a/ark/mainwindow.h +++ b/ark/mainwindow.h @@ -43,7 +43,7 @@ MainWindow: public KParts::MainWindow Q_OBJECT TQ_OBJECT public: - MainWindow( TQWidget *tqparent=0, const char *name=0 ); + MainWindow( TQWidget *parent=0, const char *name=0 ); virtual ~MainWindow(); void setExtractOnly ( bool b ); diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp index fce4576..3efc79a 100644 --- a/ark/searchbar.cpp +++ b/ark/searchbar.cpp @@ -32,12 +32,12 @@ #include <tqapplication.h> #include <tqvaluelist.h> -SearchBar::SearchBar( TQWidget* tqparent, KActionCollection* aC, const char * name ) - : KListViewSearchLine( tqparent, 0, name ) +SearchBar::SearchBar( TQWidget* parent, KActionCollection* aC, const char * name ) + : KListViewSearchLine( parent, 0, name ) { KAction *resetSearch = new KAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), aC, "reset_search" ); - resetSearch->plug( tqparent ); + resetSearch->plug( parent ); resetSearch->setWhatsThis( i18n( "Reset Search\n" "Resets the search bar, so that all archive entries are shown again." ) ); } diff --git a/ark/searchbar.h b/ark/searchbar.h index 2e245ab..7a024bf 100644 --- a/ark/searchbar.h +++ b/ark/searchbar.h @@ -34,7 +34,7 @@ class SearchBar: public KListViewSearchLine Q_OBJECT TQ_OBJECT public: - SearchBar( TQWidget* tqparent, KActionCollection* aC, const char * name = 0 ); + SearchBar( TQWidget* parent, KActionCollection* aC, const char * name = 0 ); ~SearchBar(); }; diff --git a/ark/tarlistingthread.cpp b/ark/tarlistingthread.cpp index 4b09bfd..83154c4 100644 --- a/ark/tarlistingthread.cpp +++ b/ark/tarlistingthread.cpp @@ -78,8 +78,8 @@ static char *makeAccessString(mode_t mode) return buffer; } -TarListingThread::TarListingThread( TQObject *tqparent, const TQString& filename ) - : TQThread(), m_parent( tqparent ) +TarListingThread::TarListingThread( TQObject *parent, const TQString& filename ) + : TQThread(), m_parent( parent ) { Q_ASSERT( m_parent ); m_archive = new KTar( filename ); diff --git a/ark/tarlistingthread.h b/ark/tarlistingthread.h index b6f1dea..6dcdbe5 100644 --- a/ark/tarlistingthread.h +++ b/ark/tarlistingthread.h @@ -47,7 +47,7 @@ class ListingEvent: public TQCustomEvent class TarListingThread: public TQThread { public: - TarListingThread( TQObject *tqparent, const TQString& filename ); + TarListingThread( TQObject *parent, const TQString& filename ); ~TarListingThread(); protected: diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp index 047b3f2..4f41c90 100644 --- a/charselectapplet/charselectapplet.cpp +++ b/charselectapplet/charselectapplet.cpp @@ -41,12 +41,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kcharselectapplet"); return new CharSelectApplet(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Preferences, - tqparent, "kcharselectapplet"); + parent, "kcharselectapplet"); } } @@ -55,8 +55,8 @@ static int cell_height = 16; static int char_count = 0; CharSelectApplet::CharSelectApplet(const TQString& configFile, Type type, int actions, - TQWidget *tqparent, const char *name) - : KPanelApplet(configFile, type, actions, tqparent, name), + TQWidget *parent, const char *name) + : KPanelApplet(configFile, type, actions, parent, name), _aboutData(0), _configDialog(0) { // read configuration @@ -151,8 +151,8 @@ void CharSelectApplet::about() dialog.exec(); } -CharTable::CharTable(TQWidget* tqparent, const char* name) - : TQFrame(tqparent, name), _rows(2), _cols(2), +CharTable::CharTable(TQWidget* parent, const char* name) + : TQFrame(parent, name), _rows(2), _cols(2), _activeRow(-1), _activeCol(-1), _cWidth(cell_width), _cHeight(cell_height) { @@ -336,8 +336,8 @@ void CharTable::clearCell() } -ConfigDialog::ConfigDialog(TQWidget* tqparent, const char* name) - : KDialogBase(tqparent, name, true, i18n("Configuration"), +ConfigDialog::ConfigDialog(TQWidget* parent, const char* name) + : KDialogBase(parent, name, true, i18n("Configuration"), Ok | Cancel, Ok, true) { TQVBox *page = makeVBoxMainWidget(); diff --git a/charselectapplet/charselectapplet.h b/charselectapplet/charselectapplet.h index 7145077..0aad05a 100644 --- a/charselectapplet/charselectapplet.h +++ b/charselectapplet/charselectapplet.h @@ -39,7 +39,7 @@ class ConfigDialog : public KDialogBase TQ_OBJECT public: - ConfigDialog(TQWidget* tqparent = 0, const char* name = 0); + ConfigDialog(TQWidget* parent = 0, const char* name = 0); void setCharacters(const TQString& s) { _characterInput->setText(s); } void setCellWidth(int w) { _widthSpinBox->setValue(w); } @@ -61,7 +61,7 @@ class CharTable : public TQFrame TQ_OBJECT public: - CharTable(TQWidget* tqparent = 0, const char* name = 0); + CharTable(TQWidget* parent = 0, const char* name = 0); void setRowsAndColumns(int, int); @@ -101,7 +101,7 @@ class CharSelectApplet : public KPanelApplet public: CharSelectApplet(const TQString& configFile, Type t = Stretch, int actions = 0, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); int widthForHeight(int height) const; int heightForWidth(int width) const; diff --git a/kcalc/dlabel.cpp b/kcalc/dlabel.cpp index 84f07e8..157a387 100644 --- a/kcalc/dlabel.cpp +++ b/kcalc/dlabel.cpp @@ -34,9 +34,9 @@ -DispLogic::DispLogic(TQWidget *tqparent, const char *name, +DispLogic::DispLogic(TQWidget *parent, const char *name, KActionCollection *coll) - :KCalcDisplay(tqparent,name), _history_index(0) + :KCalcDisplay(parent,name), _history_index(0) { KNumber::setDefaultFloatOutput(true); KNumber::setDefaultFractionalInput(true); diff --git a/kcalc/dlabel.h b/kcalc/dlabel.h index e2d0395..f4ce5d4 100644 --- a/kcalc/dlabel.h +++ b/kcalc/dlabel.h @@ -41,7 +41,7 @@ Q_OBJECT TQ_OBJECT public: - DispLogic(TQWidget *tqparent, const char *name, + DispLogic(TQWidget *parent, const char *name, KActionCollection *coll); ~DispLogic(); diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index 0a68046..34f4fb3 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -78,8 +78,8 @@ static const char description[] = I18N_NOOP("KDE Calculator"); static const char version[] = KCALCVERSION; -KCalculator::KCalculator(TQWidget *tqparent, const char *name) - : KMainWindow(tqparent, name), inverse(false), +KCalculator::KCalculator(TQWidget *parent, const char *name) + : KMainWindow(parent, name), inverse(false), hyp_mode(false), memory_num(0.0), calc_display(NULL), mInternalSpacing(4), core() { @@ -471,12 +471,12 @@ void KCalculator::setupStatusbar(void) statusBar()->setItemAlignment(3, AlignCenter); } -TQWidget* KCalculator::setupNumericKeys(TQWidget *tqparent) +TQWidget* KCalculator::setupNumericKeys(TQWidget *parent) { Q_CHECK_PTR(mSmallPage); Q_CHECK_PTR(mLargePage); - TQWidget *thisPage = new TQWidget(tqparent); + TQWidget *thisPage = new TQWidget(parent); KCalcButton *tmp_pb; @@ -741,33 +741,33 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *tqparent) return thisPage; } -void KCalculator::setupLogicKeys(TQWidget *tqparent) +void KCalculator::setupLogicKeys(TQWidget *parent) { - Q_CHECK_PTR(tqparent); + Q_CHECK_PTR(parent); KCalcButton *tmp_pb; - tmp_pb = new KCalcButton("AND", tqparent, "AND-Button", i18n("Bitwise AND")); + tmp_pb = new KCalcButton("AND", parent, "AND-Button", i18n("Bitwise AND")); pbLogic.insert("AND", tmp_pb); tmp_pb->setAccel(Key_Ampersand); connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotANDclicked(void))); - tmp_pb = new KCalcButton("OR", tqparent, "OR-Button", i18n("Bitwise OR")); + tmp_pb = new KCalcButton("OR", parent, "OR-Button", i18n("Bitwise OR")); pbLogic.insert("OR", tmp_pb); tmp_pb->setAccel(Key_Bar); connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotORclicked(void))); - tmp_pb = new KCalcButton("XOR", tqparent, "XOR-Button", i18n("Bitwise XOR")); + tmp_pb = new KCalcButton("XOR", parent, "XOR-Button", i18n("Bitwise XOR")); pbLogic.insert("XOR", tmp_pb); connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotXORclicked(void))); - tmp_pb = new KCalcButton("Cmp", tqparent, "One-Complement-Button", + tmp_pb = new KCalcButton("Cmp", parent, "One-Complement-Button", i18n("One's complement")); pbLogic.insert("One-Complement", tmp_pb); tmp_pb->setAccel(Key_AsciiTilde); @@ -775,7 +775,7 @@ void KCalculator::setupLogicKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotNegateclicked(void))); - tmp_pb = new KCalcButton("Lsh", tqparent, "LeftBitShift-Button", + tmp_pb = new KCalcButton("Lsh", parent, "LeftBitShift-Button", i18n("Left bit shift")); tmp_pb->setAccel(Key_Less); pbLogic.insert("LeftShift", tmp_pb); @@ -784,7 +784,7 @@ void KCalculator::setupLogicKeys(TQWidget *tqparent) connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotLeftShiftclicked(void))); - tmp_pb = new KCalcButton("Rsh", tqparent, "RightBitShift-Button", + tmp_pb = new KCalcButton("Rsh", parent, "RightBitShift-Button", i18n("Right bit shift")); tmp_pb->setAccel(Key_Greater); pbLogic.insert("RightShift", tmp_pb); @@ -794,13 +794,13 @@ void KCalculator::setupLogicKeys(TQWidget *tqparent) TQT_SLOT(slotRightShiftclicked(void))); } -void KCalculator::setupScientificKeys(TQWidget *tqparent) +void KCalculator::setupScientificKeys(TQWidget *parent) { - Q_CHECK_PTR(tqparent); + Q_CHECK_PTR(parent); KCalcButton *tmp_pb; - tmp_pb = new KCalcButton("Hyp", tqparent, "Hyp-Button", i18n("Hyperbolic mode")); + tmp_pb = new KCalcButton("Hyp", parent, "Hyp-Button", i18n("Hyperbolic mode")); pbScientific.insert("HypMode", tmp_pb); tmp_pb->setAccel(Key_H); connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), @@ -808,7 +808,7 @@ void KCalculator::setupScientificKeys(TQWidget *tqparent) connect(tmp_pb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHyptoggled(bool))); tmp_pb->setToggleButton(true); - tmp_pb = new KCalcButton(tqparent, "Sin-Button"); + tmp_pb = new KCalcButton(parent, "Sin-Button"); pbScientific.insert("Sine", tmp_pb); tmp_pb->addMode(ModeNormal, "Sin", i18n("Sine")); tmp_pb->addMode(ModeInverse, "Asin", i18n("Arc sine")); @@ -822,7 +822,7 @@ void KCalculator::setupScientificKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotSinclicked(void))); - tmp_pb = new KCalcButton(tqparent, "Cos-Button"); + tmp_pb = new KCalcButton(parent, "Cos-Button"); pbScientific.insert("Cosine", tmp_pb); tmp_pb->addMode(ModeNormal, "Cos", i18n("Cosine")); tmp_pb->addMode(ModeInverse, "Acos", i18n("Arc cosine")); @@ -836,7 +836,7 @@ void KCalculator::setupScientificKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotCosclicked(void))); - tmp_pb = new KCalcButton(tqparent, "Tan-Button"); + tmp_pb = new KCalcButton(parent, "Tan-Button"); pbScientific.insert("Tangent", tmp_pb); tmp_pb->addMode(ModeNormal, "Tan", i18n("Tangent")); tmp_pb->addMode(ModeInverse, "Atan", i18n("Arc tangent")); @@ -850,7 +850,7 @@ void KCalculator::setupScientificKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); connect(tmp_pb, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotTanclicked(void))); - tmp_pb = new KCalcButton(tqparent, "Ln-Button"); + tmp_pb = new KCalcButton(parent, "Ln-Button"); tmp_pb->addMode(ModeNormal, "Ln", i18n("Natural log")); tmp_pb->addMode(ModeInverse, "e<sup> x </sup>", i18n("Exponential function"), true); @@ -862,7 +862,7 @@ void KCalculator::setupScientificKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotLnclicked(void))); - tmp_pb = new KCalcButton(tqparent, "Log-Button"); + tmp_pb = new KCalcButton(parent, "Log-Button"); tmp_pb->addMode(ModeNormal, "Log", i18n("Logarithm to base 10")); tmp_pb->addMode(ModeInverse, "10<sup> x </sup>", i18n("10 to the power of x"), true); @@ -876,13 +876,13 @@ void KCalculator::setupScientificKeys(TQWidget *tqparent) } -void KCalculator::setupStatisticKeys(TQWidget *tqparent) +void KCalculator::setupStatisticKeys(TQWidget *parent) { - Q_CHECK_PTR(tqparent); + Q_CHECK_PTR(parent); KCalcButton *tmp_pb; - tmp_pb = new KCalcButton(tqparent, "Stat.NumData-Button"); + tmp_pb = new KCalcButton(parent, "Stat.NumData-Button"); tmp_pb->addMode(ModeNormal, "N", i18n("Number of data entered")); tmp_pb->addMode(ModeInverse, TQString::fromUtf8("\xce\xa3") + "x", i18n("Sum of all data items")); @@ -894,7 +894,7 @@ void KCalculator::setupStatisticKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatNumclicked(void))); - tmp_pb = new KCalcButton(tqparent, "Stat.Median-Button"); + tmp_pb = new KCalcButton(parent, "Stat.Median-Button"); tmp_pb->addMode(ModeNormal, "Med", i18n("Median")); pbStat.insert("Median", tmp_pb); mStatButtonList.append(tmp_pb); @@ -903,7 +903,7 @@ void KCalculator::setupStatisticKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatMedianclicked(void))); - tmp_pb = new KCalcButton(tqparent, "Stat.Mean-Button"); + tmp_pb = new KCalcButton(parent, "Stat.Mean-Button"); tmp_pb->addMode(ModeNormal, "Mea", i18n("Mean")); tmp_pb->addMode(ModeInverse, TQString::fromUtf8("\xce\xa3") + "x<sup>2</sup>", @@ -916,7 +916,7 @@ void KCalculator::setupStatisticKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatMeanclicked(void))); - tmp_pb = new KCalcButton(tqparent, "Stat.StandardDeviation-Button"); + tmp_pb = new KCalcButton(parent, "Stat.StandardDeviation-Button"); tmp_pb->addMode(ModeNormal, TQString::fromUtf8("σ",-1) + "<sub>N-1</sub>", i18n("Sample standard deviation"), true); tmp_pb->addMode(ModeInverse, TQString::fromUtf8("σ",-1) + "<sub>N</sub>", @@ -929,7 +929,7 @@ void KCalculator::setupStatisticKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatStdDevclicked(void))); - tmp_pb = new KCalcButton(tqparent, "Stat.DataInput-Button"); + tmp_pb = new KCalcButton(parent, "Stat.DataInput-Button"); tmp_pb->addMode(ModeNormal, "Dat", i18n("Enter data")); tmp_pb->addMode(ModeInverse, "CDat", i18n("Delete last data item")); pbStat.insert("InputData", tmp_pb); @@ -940,7 +940,7 @@ void KCalculator::setupStatisticKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatDataInputclicked(void))); - tmp_pb = new KCalcButton(tqparent, "Stat.ClearData-Button"); + tmp_pb = new KCalcButton(parent, "Stat.ClearData-Button"); tmp_pb->addMode(ModeNormal, "CSt", i18n("Clear data store")); pbStat.insert("ClearData", tmp_pb); mStatButtonList.append(tmp_pb); @@ -949,16 +949,16 @@ void KCalculator::setupStatisticKeys(TQWidget *tqparent) connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatClearDataclicked(void))); } -void KCalculator::setupConstantsKeys(TQWidget *tqparent) +void KCalculator::setupConstantsKeys(TQWidget *parent) { - Q_CHECK_PTR(tqparent); + Q_CHECK_PTR(parent); ConstButtonGroup = new TQButtonGroup(0, "Const-Button-Group"); connect(ConstButtonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotConstclicked(int))); KCalcConstButton *tmp_pb; - tmp_pb = new KCalcConstButton(tqparent, 0, "C1"); + tmp_pb = new KCalcConstButton(parent, 0, "C1"); tmp_pb->setAccel(ALT + Key_1); pbConstant[0] = tmp_pb; connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), @@ -967,7 +967,7 @@ void KCalculator::setupConstantsKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 0); - tmp_pb = new KCalcConstButton(tqparent, 1, "C2"); + tmp_pb = new KCalcConstButton(parent, 1, "C2"); tmp_pb->setAccel(ALT + Key_2); pbConstant[1] = tmp_pb; connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), @@ -976,7 +976,7 @@ void KCalculator::setupConstantsKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 1); - tmp_pb = new KCalcConstButton(tqparent, 2, "C3"); + tmp_pb = new KCalcConstButton(parent, 2, "C3"); tmp_pb->setAccel(ALT + Key_3); pbConstant[2] = tmp_pb; connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), @@ -985,7 +985,7 @@ void KCalculator::setupConstantsKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 2); - tmp_pb = new KCalcConstButton(tqparent, 3, "C4"); + tmp_pb = new KCalcConstButton(parent, 3, "C4"); tmp_pb->setAccel(ALT + Key_4); pbConstant[3] = tmp_pb; connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), @@ -994,7 +994,7 @@ void KCalculator::setupConstantsKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 3); - tmp_pb = new KCalcConstButton(tqparent, 4, "C5"); + tmp_pb = new KCalcConstButton(parent, 4, "C5"); tmp_pb->setAccel(ALT + Key_5); pbConstant[4] = tmp_pb; connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), @@ -1003,7 +1003,7 @@ void KCalculator::setupConstantsKeys(TQWidget *tqparent) tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 4); - tmp_pb = new KCalcConstButton(tqparent, 5, "C6"); + tmp_pb = new KCalcConstButton(parent, 5, "C6"); tmp_pb->setAccel(ALT + Key_6); pbConstant[5] = tmp_pb; connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)), diff --git a/kcalc/kcalc.h b/kcalc/kcalc.h index 4cb058d..4abceb7 100644 --- a/kcalc/kcalc.h +++ b/kcalc/kcalc.h @@ -64,7 +64,7 @@ class KCalculator : public KMainWindow TQ_OBJECT public: - KCalculator(TQWidget *tqparent = 0, const char *name = 0); + KCalculator(TQWidget *parent = 0, const char *name = 0); ~KCalculator(); signals: @@ -77,11 +77,11 @@ private: void updateGeometry(); void setupMainActions(void); void setupStatusbar(void); - TQWidget *setupNumericKeys(TQWidget *tqparent); - void setupLogicKeys(TQWidget *tqparent); - void setupScientificKeys(TQWidget *tqparent); - void setupStatisticKeys(TQWidget *tqparent); - void setupConstantsKeys(TQWidget *tqparent); + TQWidget *setupNumericKeys(TQWidget *parent); + void setupLogicKeys(TQWidget *parent); + void setupScientificKeys(TQWidget *parent); + void setupStatisticKeys(TQWidget *parent); + void setupConstantsKeys(TQWidget *parent); void keyPressEvent(TQKeyEvent *e); void keyReleaseEvent(TQKeyEvent *e); void set_precision(); diff --git a/kcalc/kcalc_button.cpp b/kcalc/kcalc_button.cpp index 8e69f6d..277e5bd 100644 --- a/kcalc/kcalc_button.cpp +++ b/kcalc/kcalc_button.cpp @@ -30,16 +30,16 @@ #include "kcalc_button.h" -KCalcButton::KCalcButton(TQWidget * tqparent, const char * name) - : KPushButton(tqparent, name), _show_accel_mode(false), +KCalcButton::KCalcButton(TQWidget * parent, const char * name) + : KPushButton(parent, name), _show_accel_mode(false), _mode_flags(ModeNormal) { setAutoDefault(false); } -KCalcButton::KCalcButton(const TQString &label, TQWidget * tqparent, +KCalcButton::KCalcButton(const TQString &label, TQWidget * parent, const char * name, const TQString &tooltip) - : KPushButton(label, tqparent, name), _show_accel_mode(false), _mode_flags(ModeNormal) + : KPushButton(label, parent, name), _show_accel_mode(false), _mode_flags(ModeNormal) { setAutoDefault(false); addMode(ModeNormal, label, tooltip); diff --git a/kcalc/kcalc_button.h b/kcalc/kcalc_button.h index 60a7c30..ba70769 100644 --- a/kcalc/kcalc_button.h +++ b/kcalc/kcalc_button.h @@ -64,8 +64,8 @@ Q_OBJECT TQ_OBJECT public: - KCalcButton(TQWidget *tqparent, const char * name = 0); - KCalcButton(const TQString &label, TQWidget *tqparent, const char * name = 0, + KCalcButton(TQWidget *parent, const char * name = 0); + KCalcButton(const TQString &label, TQWidget *parent, const char * name = 0, const TQString &tooltip = TQString()); void addMode(ButtonModeFlags mode, TQString label, TQString tooltip, bool is_label_richtext = false); @@ -93,11 +93,11 @@ Q_OBJECT TQ_OBJECT public: - KSquareButton(TQWidget *tqparent, const char * name = 0) - : KCalcButton(tqparent, name) { }; - KSquareButton(const TQString &label, TQWidget *tqparent, const char * name = 0, + KSquareButton(TQWidget *parent, const char * name = 0) + : KCalcButton(parent, name) { }; + KSquareButton(const TQString &label, TQWidget *parent, const char * name = 0, const TQString &tooltip = TQString()) - : KCalcButton(label, tqparent, name, tooltip) { }; + : KCalcButton(label, parent, name, tooltip) { }; protected: virtual void drawButtonLabel(TQPainter *paint); diff --git a/kcalc/kcalc_const_button.cpp b/kcalc/kcalc_const_button.cpp index a8eb989..071bb71 100644 --- a/kcalc/kcalc_const_button.cpp +++ b/kcalc/kcalc_const_button.cpp @@ -31,8 +31,8 @@ #include "kcalc_settings.h" -KCalcConstButton::KCalcConstButton(TQWidget *tqparent, int but_num, const char * name) - : KCalcButton(tqparent, name), _button_num(but_num) +KCalcConstButton::KCalcConstButton(TQWidget *parent, int but_num, const char * name) + : KCalcButton(parent, name), _button_num(but_num) { addMode(ModeInverse, "Store", i18n("Write display data into memory")); @@ -40,9 +40,9 @@ KCalcConstButton::KCalcConstButton(TQWidget *tqparent, int but_num, const char * } -KCalcConstButton::KCalcConstButton(const TQString &label, TQWidget *tqparent, int but_num, +KCalcConstButton::KCalcConstButton(const TQString &label, TQWidget *parent, int but_num, const char * name, const TQString &tooltip) - : KCalcButton(label, tqparent, name, tooltip), _button_num(but_num) + : KCalcButton(label, parent, name, tooltip), _button_num(but_num) { addMode(ModeInverse, "Store", i18n("Write display data into memory")); diff --git a/kcalc/kcalc_const_button.h b/kcalc/kcalc_const_button.h index 916d7f6..182ab97 100644 --- a/kcalc/kcalc_const_button.h +++ b/kcalc/kcalc_const_button.h @@ -35,9 +35,9 @@ Q_OBJECT public: - KCalcConstButton(TQWidget *tqparent, int but_num, const char * name = 0); + KCalcConstButton(TQWidget *parent, int but_num, const char * name = 0); - KCalcConstButton(const TQString &label, TQWidget *tqparent, int but_num, const char * name = 0, + KCalcConstButton(const TQString &label, TQWidget *parent, int but_num, const char * name = 0, const TQString &tooltip = TQString()); TQString constant(void) const; diff --git a/kcalc/kcalc_const_menu.cpp b/kcalc/kcalc_const_menu.cpp index 7984daf..f758c9f 100644 --- a/kcalc/kcalc_const_menu.cpp +++ b/kcalc/kcalc_const_menu.cpp @@ -49,8 +49,8 @@ const struct science_constant KCalcConstMenu::Constants[] = { {"N_A", I18N_NOOP("Avogadro's Number"), "", "6.0221415e23", Thermodynamics} }; -KCalcConstMenu::KCalcConstMenu(TQWidget * tqparent, const char * name) - : TQPopupMenu(tqparent, name) +KCalcConstMenu::KCalcConstMenu(TQWidget * parent, const char * name) + : TQPopupMenu(parent, name) { TQPopupMenu *math_menu = new TQPopupMenu(this, "mathematical constants"); TQPopupMenu *em_menu = new TQPopupMenu(this, "electromagnetic constants"); diff --git a/kcalc/kcalc_const_menu.h b/kcalc/kcalc_const_menu.h index 92d9386..be01f42 100644 --- a/kcalc/kcalc_const_menu.h +++ b/kcalc/kcalc_const_menu.h @@ -42,7 +42,7 @@ class KCalcConstMenu : public TQPopupMenu TQ_OBJECT public: - KCalcConstMenu(TQWidget * tqparent = 0, const char * name = 0); + KCalcConstMenu(TQWidget * parent = 0, const char * name = 0); static const struct science_constant Constants[]; diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp index bc87197..83e0924 100644 --- a/kcalc/kcalcdisplay.cpp +++ b/kcalc/kcalcdisplay.cpp @@ -39,8 +39,8 @@ #include "kcalcdisplay.moc" -KCalcDisplay::KCalcDisplay(TQWidget *tqparent, const char *name) - :TQLabel(tqparent,name), _beep(false), _groupdigits(false), _button(0), _lit(false), +KCalcDisplay::KCalcDisplay(TQWidget *parent, const char *name) + :TQLabel(parent,name), _beep(false), _groupdigits(false), _button(0), _lit(false), _num_base(NB_DECIMAL), _precision(9), _fixed_precision(-1), _display_amount(0), selection_timer(new TQTimer) diff --git a/kcalc/kcalcdisplay.h b/kcalc/kcalcdisplay.h index 4c0371c..d12ba2f 100644 --- a/kcalc/kcalcdisplay.h +++ b/kcalc/kcalcdisplay.h @@ -82,7 +82,7 @@ Q_OBJECT TQ_OBJECT public: - KCalcDisplay(TQWidget *tqparent=0, const char *name=0); + KCalcDisplay(TQWidget *parent=0, const char *name=0); ~KCalcDisplay(); protected: diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc index 6537090..00cb797 100644 --- a/kcharselect/kcharselectdia.cc +++ b/kcharselect/kcharselectdia.cc @@ -21,10 +21,10 @@ /******************************************************************/ //================================================================== -KCharSelectDia::KCharSelectDia(TQWidget *tqparent,const char *name, +KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name, const TQChar &_chr,const TQString &_font, int _tableNum, bool direction) - : KMainWindow(tqparent,name), vChr(_chr), vFont(_font) + : KMainWindow(parent,name), vChr(_chr), vFont(_font) { setCaption(TQString()); // Standard caption diff --git a/kcharselect/kcharselectdia.h b/kcharselect/kcharselectdia.h index 3ba9c93..083d0a0 100644 --- a/kcharselect/kcharselectdia.h +++ b/kcharselect/kcharselectdia.h @@ -28,7 +28,7 @@ class KCharSelectDia : public KMainWindow TQ_OBJECT public: - KCharSelectDia(TQWidget *tqparent,const char *name,const TQChar &_chr,const TQString &_font,int _tableNum, bool direction); + KCharSelectDia(TQWidget *parent,const char *name,const TQChar &_chr,const TQString &_font,int _tableNum, bool direction); static bool selectChar(TQString &_font,TQChar &_chr,int _tableNum); diff --git a/kdelirc/irkick/irkick.h b/kdelirc/irkick/irkick.h index d55dcee..f3b7687 100644 --- a/kdelirc/irkick/irkick.h +++ b/kdelirc/irkick/irkick.h @@ -36,7 +36,7 @@ public: KPopupMenu* contextMenu() const { return KSystemTray::contextMenu(); } KActionCollection* actionCollection() { return KSystemTray::actionCollection(); } - IRKTrayIcon(TQWidget *tqparent = 0, const char *name = 0): KSystemTray(tqparent, name) {} + IRKTrayIcon(TQWidget *parent = 0, const char *name = 0): KSystemTray(parent, name) {} }; class IRKick: public TQObject, public DCOPObject diff --git a/kdelirc/irkick/klircclient.cpp b/kdelirc/irkick/klircclient.cpp index d78b1e0..4d2089f 100644 --- a/kdelirc/irkick/klircclient.cpp +++ b/kdelirc/irkick/klircclient.cpp @@ -43,7 +43,7 @@ #include "klircclient.h" -KLircClient::KLircClient(TQWidget *tqparent, const char *name) : TQObject(tqparent, name), theSocket(0), listIsUpToDate(false) +KLircClient::KLircClient(TQWidget *parent, const char *name) : TQObject(parent, name), theSocket(0), listIsUpToDate(false) { connectToLirc(); } diff --git a/kdelirc/irkick/klircclient.h b/kdelirc/irkick/klircclient.h index 24089c8..bae36ec 100644 --- a/kdelirc/irkick/klircclient.h +++ b/kdelirc/irkick/klircclient.h @@ -108,7 +108,7 @@ public: */ bool connectToLirc(); - KLircClient(TQWidget *tqparent = 0, const char *name = 0); + KLircClient(TQWidget *parent = 0, const char *name = 0); ~KLircClient(); }; diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp index 0209f5f..632ac02 100644 --- a/kdelirc/kcmlirc/addaction.cpp +++ b/kdelirc/kcmlirc/addaction.cpp @@ -32,7 +32,7 @@ #include "profileserver.h" #include "remoteserver.h" -AddAction::AddAction(TQWidget *tqparent, const char *name, const Mode &mode): AddActionBase(tqparent, name), theMode(mode) +AddAction::AddAction(TQWidget *parent, const char *name, const Mode &mode): AddActionBase(parent, name), theMode(mode) { connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( updateForPageChange() )); connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( slotCorrectPage() )); @@ -180,7 +180,7 @@ void AddAction::updateOptions() else if(theUseDCOP->isChecked()) { if(!theObjects->selectedItem()) return; - TQListViewItem* i = theObjects->selectedItem()->tqparent(); + TQListViewItem* i = theObjects->selectedItem()->parent(); if(!i) return; isUnique = uniqueProgramMap[i]; TQRegExp r("(.*)-[0-9]+"); @@ -361,8 +361,8 @@ void AddAction::updateObjects() void AddAction::updateFunctions() { theFunctions->clear(); - if(theObjects->currentItem() && theObjects->currentItem()->tqparent()) - { TQStringList functions = getFunctions(nameProgramMap[theObjects->currentItem()->tqparent()], theObjects->currentItem()->text(0)); + if(theObjects->currentItem() && theObjects->currentItem()->parent()) + { TQStringList functions = getFunctions(nameProgramMap[theObjects->currentItem()->parent()], theObjects->currentItem()->text(0)); for(TQStringList::iterator i = functions.begin(); i != functions.end(); ++i) { Prototype p((TQString)(*i)); new KListViewItem(theFunctions, p.name(), p.argumentList(), *i); diff --git a/kdelirc/kcmlirc/addaction.h b/kdelirc/kcmlirc/addaction.h index b95fd17..e1c812b 100644 --- a/kdelirc/kcmlirc/addaction.h +++ b/kdelirc/kcmlirc/addaction.h @@ -67,7 +67,7 @@ public: TQMap<TQListViewItem *, bool> uniqueProgramMap; TQMap<TQListViewItem *, TQString> nameProgramMap; - AddAction(TQWidget *tqparent, const char *name, const Mode &mode); + AddAction(TQWidget *parent, const char *name, const Mode &mode); ~AddAction(); }; diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp index d54f23c..8b1b03b 100644 --- a/kdelirc/kcmlirc/editaction.cpp +++ b/kdelirc/kcmlirc/editaction.cpp @@ -35,7 +35,7 @@ #include "editaction.h" #include "addaction.h" -EditAction::EditAction(IRAIt action, TQWidget *tqparent, const char *name) : EditActionBase(tqparent, name) +EditAction::EditAction(IRAIt action, TQWidget *parent, const char *name) : EditActionBase(parent, name) { theAction = action; diff --git a/kdelirc/kcmlirc/editaction.h b/kdelirc/kcmlirc/editaction.h index b3d3939..bc01d24 100644 --- a/kdelirc/kcmlirc/editaction.h +++ b/kdelirc/kcmlirc/editaction.h @@ -49,7 +49,7 @@ public: virtual void updateDCOPObjects(); virtual void updateDCOPFunctions(); - EditAction(IRAIt action, TQWidget *tqparent = 0, const char *name = 0); + EditAction(IRAIt action, TQWidget *parent = 0, const char *name = 0); ~EditAction(); }; diff --git a/kdelirc/kcmlirc/editmode.cpp b/kdelirc/kcmlirc/editmode.cpp index 6092e96..aad27da 100644 --- a/kdelirc/kcmlirc/editmode.cpp +++ b/kdelirc/kcmlirc/editmode.cpp @@ -16,7 +16,7 @@ #include "editmode.h" -EditMode::EditMode(TQWidget *tqparent, const char *name, bool modal, WFlags fl) : EditModeBase(tqparent, name, modal, fl) +EditMode::EditMode(TQWidget *parent, const char *name, bool modal, WFlags fl) : EditModeBase(parent, name, modal, fl) { theIcon->setIconType(KIcon::Panel, KIcon::Any); } diff --git a/kdelirc/kcmlirc/editmode.h b/kdelirc/kcmlirc/editmode.h index 8ea0c45..8ceff01 100644 --- a/kdelirc/kcmlirc/editmode.h +++ b/kdelirc/kcmlirc/editmode.h @@ -27,7 +27,7 @@ public: void slotCheckText(const TQString &newText); void slotClearIcon(); - EditMode(TQWidget *tqparent = 0, const char *name = 0, bool modal = false, WFlags fl = 0); + EditMode(TQWidget *parent = 0, const char *name = 0, bool modal = false, WFlags fl = 0); ~EditMode(); }; diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp index 2fc7313..8ec4fff 100644 --- a/kdelirc/kcmlirc/kcmlirc.cpp +++ b/kdelirc/kcmlirc/kcmlirc.cpp @@ -49,7 +49,7 @@ typedef KGenericFactory<KCMLirc, TQWidget> theFactory; K_EXPORT_COMPONENT_FACTORY(kcmlirc, theFactory("kcmlirc")) -KCMLirc::KCMLirc(TQWidget *tqparent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(tqparent, name) +KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(parent, name) { KGlobal::locale()->insertCatalogue( "kcmlirc" ); setAboutData(new KAboutData("kcmlirc", I18N_NOOP("KDE Lirc"), VERSION, I18N_NOOP("The KDE IR Remote Control System"), KAboutData::License_GPL_V2, "Copyright (c)2003 Gav Wood", I18N_NOOP("Use this to configure KDE's infrared remote control system in order to control any KDE application with your infrared remote control."), "http://www.kde.org")); @@ -96,11 +96,11 @@ KCMLirc::~KCMLirc() void KCMLirc::updateModestqStatus(TQListViewItem *item) { - theKCMLircBase->theModes->setItemsRenameable(item && item->tqparent()); + theKCMLircBase->theModes->setItemsRenameable(item && item->parent()); theKCMLircBase->theAddActions->setEnabled(ProfileServer::profileServer()->profiles().count() && theKCMLircBase->theModes->selectedItem() && RemoteServer::remoteServer()->remotes()[modeMap[theKCMLircBase->theModes->selectedItem()].remote()]); theKCMLircBase->theAddAction->setEnabled(item); theKCMLircBase->theAddMode->setEnabled(item); - theKCMLircBase->theRemoveMode->setEnabled(item && item->tqparent()); + theKCMLircBase->theRemoveMode->setEnabled(item && item->parent()); theKCMLircBase->theEditMode->setEnabled(item); } @@ -114,7 +114,7 @@ void KCMLirc::slotRenamed(TQListViewItem *item) { if(!item) return; - if(item->tqparent() && item->text(0) != modeMap[item].name()) + if(item->parent() && item->text(0) != modeMap[item].name()) { allActions.renameMode(modeMap[item], item->text(0)); allModes.rename(modeMap[item], item->text(0)); emit changed(true); @@ -128,7 +128,7 @@ void KCMLirc::slotEditAction() EditAction theDialog(actionMap[theKCMLircBase->theActions->currentItem()], this); TQListViewItem *item = theKCMLircBase->theModes->currentItem(); - if(item->tqparent()) item = item->tqparent(); + if(item->parent()) item = item->parent(); theDialog.theModes->insertItem(i18n("[Exit current mode]")); for(item = item->firstChild(); item; item = item->nextSibling()) theDialog.theModes->insertItem(item->text(0)); @@ -166,7 +166,7 @@ void KCMLirc::slotAddAction() // populate the modes list box TQListViewItem *item = theKCMLircBase->theModes->selectedItem(); - if(item->tqparent()) item = item->tqparent(); + if(item->parent()) item = item->parent(); theDialog.theModes->setEnabled(item->firstChild()); theDialog.theSwitchMode->setEnabled(item->firstChild()); for(item = item->firstChild(); item; item = item->nextSibling()) @@ -202,7 +202,7 @@ void KCMLirc::slotAddAction() a.setRepeat(false); } // DCOP? - else if(theDialog.theUseDCOP->isChecked() && theDialog.theObjects->selectedItem() && theDialog.theObjects->selectedItem()->tqparent() && theDialog.theFunctions->selectedItem()) + else if(theDialog.theUseDCOP->isChecked() && theDialog.theObjects->selectedItem() && theDialog.theObjects->selectedItem()->parent() && theDialog.theFunctions->selectedItem()) { a.setProgram(theDialog.program); a.setObject(theDialog.theObjects->selectedItem()->text(0)); @@ -284,7 +284,7 @@ void KCMLirc::slotAddMode() NewMode theDialog(this, 0); TQMap<TQListViewItem *, TQString> remoteMap; TQListViewItem *tr = theKCMLircBase->theModes->selectedItem(); - if(tr) if(tr->tqparent()) tr = tr->tqparent(); + if(tr) if(tr->parent()) tr = tr->parent(); for(TQListViewItem *i = theKCMLircBase->theModes->firstChild(); i; i = i->nextSibling()) { KListViewItem *a = new KListViewItem(theDialog.theRemotes, i->text(0)); remoteMap[a] = modeMap[i].remote(); @@ -305,7 +305,7 @@ void KCMLirc::slotEditMode() EditMode theDialog(this, 0); Mode &mode = modeMap[theKCMLircBase->theModes->selectedItem()]; - theDialog.theName->setEnabled(theKCMLircBase->theModes->selectedItem()->tqparent()); + theDialog.theName->setEnabled(theKCMLircBase->theModes->selectedItem()->parent()); theDialog.theName->setText(mode.name().isEmpty() ? mode.remoteName() : mode.name()); if(!mode.iconFile().isNull()) theDialog.theIcon->setIcon(mode.iconFile()); @@ -331,7 +331,7 @@ void KCMLirc::slotEditMode() void KCMLirc::slotRemoveMode() { if(!theKCMLircBase->theModes->selectedItem()) return; - if(!theKCMLircBase->theModes->selectedItem()->tqparent()) return; + if(!theKCMLircBase->theModes->selectedItem()->parent()) return; 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) { @@ -465,7 +465,7 @@ void KCMLirc::updateInformation() if(!theKCMLircBase->theExtensions->selectedItem()) return; - if(!theKCMLircBase->theExtensions->selectedItem()->tqparent()) + if(!theKCMLircBase->theExtensions->selectedItem()->parent()) { theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").tqarg(theKCMLircBase->theExtensions->selectedItem()->text(0))); if(theKCMLircBase->theExtensions->selectedItem()->text(0) == i18n("Applications")) @@ -473,7 +473,7 @@ void KCMLirc::updateInformation() else if(theKCMLircBase->theExtensions->selectedItem()->text(0) == i18n("Remote Controls")) new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Remote Controls"), TQString().setNum(theKCMLircBase->theExtensions->selectedItem()->childCount())); } - else if(theKCMLircBase->theExtensions->selectedItem()->tqparent()->text(0) == i18n("Applications")) + else if(theKCMLircBase->theExtensions->selectedItem()->parent()->text(0) == i18n("Applications")) { ProfileServer *theServer = ProfileServer::profileServer(); const Profile *p = theServer->profiles()[profileMap[theKCMLircBase->theExtensions->selectedItem()]]; @@ -483,7 +483,7 @@ void KCMLirc::updateInformation() new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Actions"), TQString().setNum(p->actions().count())); theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").tqarg(p->name())); } - else if(theKCMLircBase->theExtensions->selectedItem()->tqparent()->text(0) == i18n("Remote Controls")) + else if(theKCMLircBase->theExtensions->selectedItem()->parent()->text(0) == i18n("Remote Controls")) { RemoteServer *theServer = RemoteServer::remoteServer(); const Remote *p = theServer->remotes()[remoteMap[theKCMLircBase->theExtensions->selectedItem()]]; @@ -534,9 +534,9 @@ void KCMLirc::configChanged() // TODO: Take this out when I know how extern "C" { - KDE_EXPORT KCModule *create_kcmlirc(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_kcmlirc(TQWidget *parent, const char *) { KGlobal::locale()->insertCatalogue("kcmlirc"); - return new KCMLirc(tqparent, "KCMLirc"); + return new KCMLirc(parent, "KCMLirc"); } } diff --git a/kdelirc/kcmlirc/kcmlirc.h b/kdelirc/kcmlirc/kcmlirc.h index 4af2347..b4ea329 100644 --- a/kdelirc/kcmlirc/kcmlirc.h +++ b/kdelirc/kcmlirc/kcmlirc.h @@ -78,7 +78,7 @@ public: virtual void defaults(); virtual void configChanged(); - KCMLirc(TQWidget *tqparent = 0, const char *name = 0, TQStringList args = TQStringList()); + KCMLirc(TQWidget *parent = 0, const char *name = 0, TQStringList args = TQStringList()); ~KCMLirc(); }; diff --git a/kdelirc/kcmlirc/modeslist.cpp b/kdelirc/kcmlirc/modeslist.cpp index a182129..83678d1 100644 --- a/kdelirc/kcmlirc/modeslist.cpp +++ b/kdelirc/kcmlirc/modeslist.cpp @@ -16,7 +16,7 @@ #include "modeslist.h" -ModesList::ModesList(TQWidget *tqparent, const char *name) : KListView(tqparent, name) +ModesList::ModesList(TQWidget *parent, const char *name) : KListView(parent, name) { setAcceptDrops(true); setDropVisualizer(false); diff --git a/kdelirc/kcmlirc/modeslist.h b/kdelirc/kcmlirc/modeslist.h index 5cc77a8..c0e9aa8 100644 --- a/kdelirc/kcmlirc/modeslist.h +++ b/kdelirc/kcmlirc/modeslist.h @@ -28,7 +28,7 @@ class ModesList : public KListView TQ_OBJECT public: virtual bool acceptDrag(TQDropEvent *) const; - ModesList(TQWidget *tqparent = 0, const char *name = 0); + ModesList(TQWidget *parent = 0, const char *name = 0); }; #endif diff --git a/kdelirc/kdelirc/profileserver.h b/kdelirc/kdelirc/profileserver.h index f049ad4..0d9bc59 100644 --- a/kdelirc/kdelirc/profileserver.h +++ b/kdelirc/kdelirc/profileserver.h @@ -36,7 +36,7 @@ class ProfileActionArgument TQString theComment, theType; Range theRange; TQString theDefault; // should be TQVariant? - const ProfileAction *tqparent; + const ProfileAction *parent; friend class Profile; public: @@ -49,15 +49,15 @@ public: const Range &range() const { return theRange; } void setRange(const Range &a) { theRange = a; } - const ProfileAction *action() const { return tqparent; } - void setAction(const ProfileAction *a) { tqparent = a; } + const ProfileAction *action() const { return parent; } + void setAction(const ProfileAction *a) { parent = a; } }; class ProfileAction { TQString theObjId, thePrototype, theName, theComment, theClass; float theMultiplier; - const Profile *tqparent; + const Profile *parent; bool theRepeat, theAutoStart; TQValueList<ProfileActionArgument> theArguments; @@ -81,8 +81,8 @@ public: void setAutoStart(bool a) { theAutoStart = a; } const TQValueList<ProfileActionArgument> &arguments() const { return theArguments; } - const Profile *profile() const { return tqparent; } - void setProfile(const Profile *a) { tqparent = a; } + const Profile *profile() const { return parent; } + void setProfile(const Profile *a) { parent = a; } }; class Profile : public TQXmlDefaultHandler diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp index 1c21d15..596cbcb 100644 --- a/kdf/disklist.cpp +++ b/kdf/disklist.cpp @@ -37,8 +37,8 @@ /*************************************************************************** * constructor **/ -DiskList::DiskList(TQObject *tqparent, const char *name) - : TQObject(tqparent,name) +DiskList::DiskList(TQObject *parent, const char *name) + : TQObject(parent,name) { kdDebug() << k_funcinfo << endl; diff --git a/kdf/disklist.h b/kdf/disklist.h index 638dc59..fbce6c2 100644 --- a/kdf/disklist.h +++ b/kdf/disklist.h @@ -97,7 +97,7 @@ class DiskList : public TQObject { Q_OBJECT TQ_OBJECT public: - DiskList( TQObject *tqparent=0, const char *name=0 ); + DiskList( TQObject *parent=0, const char *name=0 ); ~DiskList(); int readFSTAB(); int readDF(); diff --git a/kdf/disks.cpp b/kdf/disks.cpp index 721f10d..155e6e2 100644 --- a/kdf/disks.cpp +++ b/kdf/disks.cpp @@ -65,14 +65,14 @@ void DiskEntry::init() } -DiskEntry::DiskEntry(TQObject *tqparent, const char *name) - : TQObject (tqparent, name) +DiskEntry::DiskEntry(TQObject *parent, const char *name) + : TQObject (parent, name) { init(); } -DiskEntry::DiskEntry(const TQString & deviceName, TQObject *tqparent, const char *name) - : TQObject (tqparent, name) +DiskEntry::DiskEntry(const TQString & deviceName, TQObject *parent, const char *name) + : TQObject (parent, name) { init(); diff --git a/kdf/disks.h b/kdf/disks.h index d27bc0b..2993323 100644 --- a/kdf/disks.h +++ b/kdf/disks.h @@ -42,8 +42,8 @@ class DiskEntry : public TQObject Q_OBJECT TQ_OBJECT public: - DiskEntry(TQObject *tqparent=0, const char *name=0); - DiskEntry(const TQString & deviceName, TQObject *tqparent=0, const char *name=0); + DiskEntry(TQObject *parent=0, const char *name=0); + DiskEntry(const TQString & deviceName, TQObject *parent=0, const char *name=0); ~DiskEntry(); TQString lastSysError() {return sysStringErrOut; } TQString deviceName() const { return device; } diff --git a/kdf/kcmdf.cpp b/kdf/kcmdf.cpp index 72389ef..2e26113 100644 --- a/kdf/kcmdf.cpp +++ b/kdf/kcmdf.cpp @@ -32,8 +32,8 @@ #include "kcmdf.h" -KDiskFreeWidget::KDiskFreeWidget( TQWidget *tqparent, const char *name ) - : KCModule( tqparent, name ) +KDiskFreeWidget::KDiskFreeWidget( TQWidget *parent, const char *name ) + : KCModule( parent, name ) { setButtons(Help); @@ -57,9 +57,9 @@ TQString KDiskFreeWidget::quickHelp() const extern "C" { - KDE_EXPORT KCModule* create_kdf( TQWidget *tqparent, const char * /*name*/ ) + KDE_EXPORT KCModule* create_kdf( TQWidget *parent, const char * /*name*/ ) { - return new KDiskFreeWidget( tqparent , "kdf" ); + return new KDiskFreeWidget( parent , "kdf" ); } } diff --git a/kdf/kcmdf.h b/kdf/kcmdf.h index a33739c..7f5adef 100644 --- a/kdf/kcmdf.h +++ b/kdf/kcmdf.h @@ -36,7 +36,7 @@ class KDiskFreeWidget : public KCModule TQ_OBJECT public: - KDiskFreeWidget( TQWidget *tqparent=0, const char *name=0 ); + KDiskFreeWidget( TQWidget *parent=0, const char *name=0 ); ~KDiskFreeWidget(); TQString quickHelp() const; @@ -34,7 +34,7 @@ class KDFTopLevel : public KMainWindow TQ_OBJECT public: - KDFTopLevel(TQWidget *tqparent=0, const char *name=0); + KDFTopLevel(TQWidget *parent=0, const char *name=0); ~KDFTopLevel() { }; protected slots: diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp index 2478d28..6831868 100644 --- a/kdf/kdfconfig.cpp +++ b/kdf/kdfconfig.cpp @@ -50,8 +50,8 @@ static bool GUI; #endif -KDFConfigWidget::KDFConfigWidget(TQWidget *tqparent, const char *name, bool init) - : TQWidget( tqparent, name) +KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init) + : TQWidget( parent, name) { mTabName.resize(8); diff --git a/kdf/kdfconfig.h b/kdf/kdfconfig.h index b1d8821..7c6aea3 100644 --- a/kdf/kdfconfig.h +++ b/kdf/kdfconfig.h @@ -60,7 +60,7 @@ class KDFConfigWidget : public TQWidget }; public: - KDFConfigWidget( TQWidget *tqparent=0, const char *name=0, bool init=false); + KDFConfigWidget( TQWidget *parent=0, const char *name=0, bool init=false); ~KDFConfigWidget(); public slots: diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp index c81d5a3..8fbb97c 100644 --- a/kdf/kdfwidget.cpp +++ b/kdf/kdfwidget.cpp @@ -56,8 +56,8 @@ static bool GUI; /**************************************************************/ -CListViewItem::CListViewItem( CListView * tqparent, TQListViewItem * after ) - :TQListViewItem( tqparent, after ) +CListViewItem::CListViewItem( CListView * parent, TQListViewItem * after ) + :TQListViewItem( parent, after ) {} int CListViewItem::compare ( TQListViewItem *i, int column, bool ) const @@ -92,8 +92,8 @@ void CListViewItem::setKeys (int kb_size, int kb_avail, float percent_full) /**************************************************************/ -KDFWidget::KDFWidget( TQWidget *tqparent, const char *name, bool init ) - : TQWidget(tqparent, name), mOptionDialog(0), mPopup(0), mTimer(0) +KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init ) + : TQWidget(parent, name), mOptionDialog(0), mPopup(0), mTimer(0) { connect(&mDiskList , TQT_SIGNAL(readDFDone() ), this, TQT_SLOT (updateDFDone()) ); @@ -131,7 +131,7 @@ KDFWidget::KDFWidget( TQWidget *tqparent, const char *name, bool init ) this, TQT_SLOT(columnSizeChanged(int, int, int)) ); makeColumns(); - mIsTopLevel = TQString(tqparent->className()) == "KDFTopLevel" ? true : false; + mIsTopLevel = TQString(parent->className()) == "KDFTopLevel" ? true : false; } loadSettings(); diff --git a/kdf/kdfwidget.h b/kdf/kdfwidget.h index af2daa5..79b8715 100644 --- a/kdf/kdfwidget.h +++ b/kdf/kdfwidget.h @@ -75,7 +75,7 @@ class CTabEntry class CListViewItem : public TQListViewItem { public: - CListViewItem ( CListView * tqparent, TQListViewItem * after ); + CListViewItem ( CListView * parent, TQListViewItem * after ); virtual int compare ( TQListViewItem* i, int col, bool) const; @@ -108,7 +108,7 @@ class KDFWidget : public TQWidget }; public: - KDFWidget( TQWidget *tqparent=0, const char *name=0, bool init=false); + KDFWidget( TQWidget *parent=0, const char *name=0, bool init=false); ~KDFWidget( void ); public slots: diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp index fb85996..8960e2f 100644 --- a/kdf/kwikdisk.cpp +++ b/kdf/kwikdisk.cpp @@ -196,12 +196,12 @@ void KwikDisk::updateDFDone() // Special root icon, normal user cant mount. // // 2000-01-23 Espen Sand - // Careful here: If the tqmask has not been defined we can - // not use TQPixmap::tqmask() because it returns 0 => segfault + // Careful here: If the mask has not been defined we can + // not use TQPixmap::mask() because it returns 0 => segfault // - if( pix->tqmask() != 0 ) + if( pix->mask() != 0 ) { - TQBitmap *bm = new TQBitmap(*(pix->tqmask())); + TQBitmap *bm = new TQBitmap(*(pix->mask())); if( bm != 0 ) { TQPainter qp( bm ); diff --git a/kdf/listview.cpp b/kdf/listview.cpp index df11e96..49021ee 100644 --- a/kdf/listview.cpp +++ b/kdf/listview.cpp @@ -34,8 +34,8 @@ template class TQDict<TQPixmap>; -CListView::CListView( TQWidget *tqparent, const char *name, int visibleItem ) - :KListView( tqparent, name ), mVisibleItem(TQMAX( 1, visibleItem )) +CListView::CListView( TQWidget *parent, const char *name, int visibleItem ) + :KListView( parent, name ), mVisibleItem(TQMAX( 1, visibleItem )) { setVisibleItem(visibleItem); mPixDict.setAutoDelete(true); @@ -76,12 +76,12 @@ const TQPixmap &CListView::icon( const TQString &iconName, bool drawBorder ) { // // 2000-01-23 Espen Sand - // Careful here: If the tqmask has not been defined we can - // not use TQPixmap::tqmask() because it returns 0 => segfault + // Careful here: If the mask has not been defined we can + // not use TQPixmap::mask() because it returns 0 => segfault // - if( pix->tqmask() != 0 ) + if( pix->mask() != 0 ) { - TQBitmap *bm = new TQBitmap(*(pix->tqmask())); + TQBitmap *bm = new TQBitmap(*(pix->mask())); if( bm != 0 ) { TQPainter qp(bm); diff --git a/kdf/listview.h b/kdf/listview.h index c937539..96ae398 100644 --- a/kdf/listview.h +++ b/kdf/listview.h @@ -31,7 +31,7 @@ class CListView : public KListView TQ_OBJECT public: - CListView( TQWidget *tqparent=0, const char *name=0, int visibleItem=10 ); + CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 ); void setVisibleItem( int visibleItem, bool updateSize=true ); virtual TQSize tqsizeHint( void ) const; diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp index 12d968a..1819760 100644 --- a/kdf/mntconfig.cpp +++ b/kdf/mntconfig.cpp @@ -47,8 +47,8 @@ static bool GUI; #endif -MntConfigWidget::MntConfigWidget(TQWidget *tqparent, const char *name, bool init) - : TQWidget(tqparent, name) +MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init) + : TQWidget(parent, name) { mInitializing = false; diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h index f3f0d56..682c229 100644 --- a/kdf/mntconfig.h +++ b/kdf/mntconfig.h @@ -59,7 +59,7 @@ class MntConfigWidget : public TQWidget }; public: - MntConfigWidget( TQWidget *tqparent=0, const char *name=0, bool init=false ); + MntConfigWidget( TQWidget *parent=0, const char *name=0, bool init=false ); ~MntConfigWidget(); public slots: diff --git a/kdf/optiondialog.cpp b/kdf/optiondialog.cpp index 39df7a0..6734294 100644 --- a/kdf/optiondialog.cpp +++ b/kdf/optiondialog.cpp @@ -23,9 +23,9 @@ #include "mntconfig.h" #include "optiondialog.h" -COptionDialog::COptionDialog( TQWidget *tqparent, const char *name, bool modal ) +COptionDialog::COptionDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Tabbed, i18n("Configure"), Help|Apply|Ok|Cancel, Ok, - tqparent, name, modal ) + parent, name, modal ) { setHelp( "kcontrol/kdf/index.html", TQString() ); diff --git a/kdf/optiondialog.h b/kdf/optiondialog.h index ea3f4c3..848a126 100644 --- a/kdf/optiondialog.h +++ b/kdf/optiondialog.h @@ -31,7 +31,7 @@ class COptionDialog : public KDialogBase TQ_OBJECT public: - COptionDialog( TQWidget *tqparent=0, const char *name=0, bool modal=true ); + COptionDialog( TQWidget *parent=0, const char *name=0, bool modal=true ); ~COptionDialog( void ); protected slots: diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp index efffb67..d5bcba5 100644 --- a/kedit/kedit.cpp +++ b/kedit/kedit.cpp @@ -1317,8 +1317,8 @@ extern "C" KDE_EXPORT int kdemain (int argc, char **argv) return a.exec (); } -SettingsDialog::SettingsDialog(TQWidget *tqparent, const char *name,KConfigSkeleton *config, KSpellConfig *_spellConfig) - : KConfigDialog(tqparent, name, config), +SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config, KSpellConfig *_spellConfig) + : KConfigDialog(parent, name, config), spellConfig(_spellConfig), spellConfigChanged(false) { // Font diff --git a/kedit/kedit.h b/kedit/kedit.h index 6bc22d4..9faba86 100644 --- a/kedit/kedit.h +++ b/kedit/kedit.h @@ -62,7 +62,7 @@ public: OPEN_INSERT = 4, OPEN_NEW = 8 }; - TopLevel( TQWidget *tqparent=0, const char *name=0 ); + TopLevel( TQWidget *parent=0, const char *name=0 ); ~TopLevel(); /** @@ -209,7 +209,7 @@ Q_OBJECT TQ_OBJECT public: - SettingsDialog(TQWidget *tqparent, const char *name,KConfigSkeleton *config, KSpellConfig *_spellConfig); + SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config, KSpellConfig *_spellConfig); protected slots: void updateSettings(); diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp index a35f82e..32dfc19 100644 --- a/kedit/ktextfiledlg.cpp +++ b/kedit/ktextfiledlg.cpp @@ -32,9 +32,9 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir, const TQString& filter, - TQWidget *tqparent, const char* name, + TQWidget *parent, const char* name, bool modal) - : KFileDialog(startDir, filter, tqparent, name, modal) + : KFileDialog(startDir, filter, parent, name, modal) { /* // insert encoding action into toolbar @@ -144,12 +144,12 @@ void KTextFileDialog::slotShowEncCombo() KURL KTextFileDialog::getOpenURLwithEncoding( const TQString& startDir, const TQString& filter, - TQWidget *tqparent, + TQWidget *parent, const TQString& caption, const TQString& encoding, const TQString& buttontext) { - KTextFileDialog dlg(startDir, filter, tqparent, "filedialog", true); + KTextFileDialog dlg(startDir, filter, parent, "filedialog", true); dlg.setEncoding(encoding); dlg.setOperationMode( Opening ); @@ -175,11 +175,11 @@ KURL KTextFileDialog::getOpenURLwithEncoding( KURL KTextFileDialog::getSaveURLwithEncoding( const TQString& dir, const TQString& filter, - TQWidget *tqparent, + TQWidget *parent, const TQString& caption, const TQString& encoding) { - KTextFileDialog dlg(dir, filter, tqparent, "filedialog", true); + KTextFileDialog dlg(dir, filter, parent, "filedialog", true); dlg.setEncoding(encoding); dlg.setOperationMode( Saving ); diff --git a/kedit/ktextfiledlg.h b/kedit/ktextfiledlg.h index eda651a..d4bd76e 100644 --- a/kedit/ktextfiledlg.h +++ b/kedit/ktextfiledlg.h @@ -42,7 +42,7 @@ class KTextFileDialog : public KFileDialog public: KTextFileDialog(const TQString& startDir, const TQString& filter, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool modal); ~KTextFileDialog(); @@ -50,14 +50,14 @@ class KTextFileDialog : public KFileDialog static KURL getOpenURLwithEncoding( const TQString& startDir = TQString(), const TQString& filter= TQString(), - TQWidget *tqparent= 0, + TQWidget *parent= 0, const TQString& caption = TQString(), const TQString& encoding = TQString(), const TQString& buttonText = TQString()); static KURL getSaveURLwithEncoding( const TQString& dir, const TQString& filter, - TQWidget *tqparent, + TQWidget *parent, const TQString& caption, const TQString& encoding = TQString()); diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp index 110bc20..21309b3 100644 --- a/kfloppy/floppy.cpp +++ b/kfloppy/floppy.cpp @@ -48,8 +48,8 @@ #include "floppy.h" #include "format.h" -FloppyData::FloppyData(TQWidget * tqparent, const char * name) - : KDialog( tqparent, name ), +FloppyData::FloppyData(TQWidget * parent, const char * name) + : KDialog( parent, name ), formatActions(0L), m_canLowLevel(false), m_canZeroOut( false ) { diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h index 393d919..30b0519 100644 --- a/kfloppy/floppy.h +++ b/kfloppy/floppy.h @@ -47,7 +47,7 @@ class FloppyData : public KDialog TQ_OBJECT public: - FloppyData(TQWidget* tqparent = 0, const char * name = 0); + FloppyData(TQWidget* parent = 0, const char * name = 0); virtual ~FloppyData(); /// Need to overload normal show() in order to mangle caption diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp index 26229f2..03f6f41 100644 --- a/kfloppy/format.cpp +++ b/kfloppy/format.cpp @@ -51,8 +51,8 @@ static TQString extPath = TQString(); -KFAction::KFAction(TQObject *tqparent) : - TQObject(tqparent) +KFAction::KFAction(TQObject *parent) : + TQObject(parent) { DEBUGSETUP; } @@ -79,8 +79,8 @@ public: TQPtrList<KFAction> list; } ; -KFActionQueue::KFActionQueue(TQObject *tqparent) : - KFAction(tqparent), +KFActionQueue::KFActionQueue(TQObject *parent) : + KFAction(parent), d(new KFActionQueue_p) { DEBUGSETUP; @@ -625,8 +625,8 @@ void DDZeroOut::processDone(KProcess *p) /* static */ TQString FATFilesystem::newfs_fat = TQString() ; -FATFilesystem::FATFilesystem(TQObject *tqparent) : - FloppyAction(tqparent) +FATFilesystem::FATFilesystem(TQObject *parent) : + FloppyAction(parent) { DEBUGSETUP; runtimeCheck(); @@ -749,8 +749,8 @@ void FATFilesystem::processStdOut(KProcess *, char *b, int l) /* static */ TQString UFSFilesystem::newfs = TQString() ; -UFSFilesystem::UFSFilesystem(TQObject *tqparent) : - FloppyAction(tqparent) +UFSFilesystem::UFSFilesystem(TQObject *parent) : + FloppyAction(parent) { DEBUGSETUP; runtimeCheck(); @@ -808,8 +808,8 @@ void UFSFilesystem::exec() /* static */ TQString Ext2Filesystem::newfs = TQString() ; -Ext2Filesystem::Ext2Filesystem(TQObject *tqparent) : - FloppyAction(tqparent) +Ext2Filesystem::Ext2Filesystem(TQObject *parent) : + FloppyAction(parent) { DEBUGSETUP; runtimeCheck(); @@ -906,8 +906,8 @@ void Ext2Filesystem::processStdOut(KProcess *, char *b, int l) #ifdef ANY_LINUX /* static */ TQString MinixFilesystem::newfs = TQString() ; -MinixFilesystem::MinixFilesystem(TQObject *tqparent) : - FloppyAction(tqparent) +MinixFilesystem::MinixFilesystem(TQObject *parent) : + FloppyAction(parent) { DEBUGSETUP; runtimeCheck(); diff --git a/kfloppy/format.h b/kfloppy/format.h index f4c57c8..e861a0d 100644 --- a/kfloppy/format.h +++ b/kfloppy/format.h @@ -69,7 +69,7 @@ Q_OBJECT TQ_OBJECT public: - KFAction(TQObject *tqparent = 0L); + KFAction(TQObject *parent = 0L); virtual ~KFAction(); public slots: @@ -119,7 +119,7 @@ Q_OBJECT TQ_OBJECT public: - KFActionQueue(TQObject *tqparent = 0L); + KFActionQueue(TQObject *parent = 0L); virtual ~KFActionQueue(); /** @@ -179,7 +179,7 @@ Q_OBJECT TQ_OBJECT public: - FloppyAction(TQObject *tqparent = 0L); + FloppyAction(TQObject *parent = 0L); /** * Kills the running process, if one exists. @@ -252,7 +252,7 @@ protected: class FDFormat : public FloppyAction { public: - FDFormat(TQObject *tqparent = 0L); + FDFormat(TQObject *parent = 0L); virtual void exec(); @@ -288,7 +288,7 @@ protected: class DDZeroOut : public FloppyAction { public: - DDZeroOut(TQObject *tqparent = 0L); + DDZeroOut(TQObject *parent = 0L); virtual void exec(); @@ -318,7 +318,7 @@ protected: class FATFilesystem : public FloppyAction { public: - FATFilesystem(TQObject *tqparent = 0L); + FATFilesystem(TQObject *parent = 0L); virtual void exec(); @@ -349,7 +349,7 @@ protected: class Ext2Filesystem : public FloppyAction { public: - Ext2Filesystem(TQObject *tqparent = 0L); + Ext2Filesystem(TQObject *parent = 0L); virtual void exec(); @@ -377,7 +377,7 @@ protected: class UFSFilesystem : public FloppyAction { public: - UFSFilesystem(TQObject *tqparent = 0L); + UFSFilesystem(TQObject *parent = 0L); virtual void exec(); @@ -399,7 +399,7 @@ protected: class MinixFilesystem : public FloppyAction { public: - MinixFilesystem(TQObject *tqparent = 0L); + MinixFilesystem(TQObject *parent = 0L); virtual void exec(); diff --git a/kgpg/detailedconsole.cpp b/kgpg/detailedconsole.cpp index 308eec8..6874813 100644 --- a/kgpg/detailedconsole.cpp +++ b/kgpg/detailedconsole.cpp @@ -30,8 +30,8 @@ #include "detailedconsole.h" -KDetailedConsole::KDetailedConsole(TQWidget *tqparent, const char *name,const TQString &boxLabel,const TQString &errormessage) - : KDialogBase(tqparent,name,true,i18n("Sorry"),KDialogBase::Details|KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok) +KDetailedConsole::KDetailedConsole(TQWidget *parent, const char *name,const TQString &boxLabel,const TQString &errormessage) + : KDialogBase(parent,name,true,i18n("Sorry"),KDialogBase::Details|KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok) { TQWidget *page = new TQWidget( this ); setMainWidget(page); @@ -51,8 +51,8 @@ KDetailedConsole::KDetailedConsole(TQWidget *tqparent, const char *name,const TQ KDetailedConsole::~KDetailedConsole() {} -KDetailedInfo::KDetailedInfo(TQWidget *tqparent, const char *name , const TQString &boxLabel,const TQString &errormessage,TQStringList keysList) - : KDialogBase(Swallow, i18n("Info"),KDialogBase::Details|KDialogBase::Ok, KDialogBase::Ok,tqparent,name,true) +KDetailedInfo::KDetailedInfo(TQWidget *parent, const char *name , const TQString &boxLabel,const TQString &errormessage,TQStringList keysList) + : KDialogBase(Swallow, i18n("Info"),KDialogBase::Details|KDialogBase::Ok, KDialogBase::Ok,parent,name,true) { bool checkboxResult; KMessageBox::createKMessageBox(this, TQMessageBox::Information, diff --git a/kgpg/detailedconsole.h b/kgpg/detailedconsole.h index ef91446..2235093 100644 --- a/kgpg/detailedconsole.h +++ b/kgpg/detailedconsole.h @@ -24,7 +24,7 @@ class KDetailedConsole : public KDialogBase { public: - KDetailedConsole(TQWidget *tqparent=0, const char *name=0,const TQString &boxLabel=TQString(),const TQString &errormessage=TQString()); + KDetailedConsole(TQWidget *parent=0, const char *name=0,const TQString &boxLabel=TQString(),const TQString &errormessage=TQString()); ~KDetailedConsole(); }; @@ -34,7 +34,7 @@ class KDetailedInfo : public KDialogBase { public: - KDetailedInfo(TQWidget *tqparent=0, const char *name=0,const TQString &boxLabel=TQString(),const TQString &errormessage=TQString(),TQStringList keysList=TQStringList()); + KDetailedInfo(TQWidget *parent=0, const char *name=0,const TQString &boxLabel=TQString(),const TQString &errormessage=TQString(),TQStringList keysList=TQStringList()); ~KDetailedInfo(); }; diff --git a/kgpg/keygener.cpp b/kgpg/keygener.cpp index 9de17f8..70bbff7 100644 --- a/kgpg/keygener.cpp +++ b/kgpg/keygener.cpp @@ -34,7 +34,7 @@ #include "keygener.h" /////////////////////// main window -keyGenerate::keyGenerate(TQWidget *tqparent, const char *name):KDialogBase( tqparent, name, true,i18n("Key Generation"),Apply | Ok | Cancel) +keyGenerate::keyGenerate(TQWidget *parent, const char *name):KDialogBase( parent, name, true,i18n("Key Generation"),Apply | Ok | Cancel) { expert=false; setButtonApply(i18n("Expert Mode")); diff --git a/kgpg/keygener.h b/kgpg/keygener.h index ba8c03c..d5f0120 100644 --- a/kgpg/keygener.h +++ b/kgpg/keygener.h @@ -27,7 +27,7 @@ class keyGenerate : public KDialogBase Q_OBJECT TQ_OBJECT public: - keyGenerate(TQWidget *tqparent=0, const char *name=0); + keyGenerate(TQWidget *parent=0, const char *name=0); KComboBox *keykind,*keysize,*keyexp; KLineEdit *numb,*comment,*kname,*mail; diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp index 50584b7..93aa61f 100644 --- a/kgpg/keyinfowidget.cpp +++ b/kgpg/keyinfowidget.cpp @@ -43,7 +43,7 @@ #include "kgpgsettings.h" #include "kgpginterface.h" -KgpgKeyInfo::KgpgKeyInfo(TQWidget *tqparent, const char *name,TQString sigkey):KDialogBase( Swallow, i18n("Key Properties"), Close, Close, tqparent, name,true) +KgpgKeyInfo::KgpgKeyInfo(TQWidget *parent, const char *name,TQString sigkey):KDialogBase( Swallow, i18n("Key Properties"), Close, Close, parent, name,true) { FILE *pass; diff --git a/kgpg/keyinfowidget.h b/kgpg/keyinfowidget.h index 8d9bc3f..faa3b16 100644 --- a/kgpg/keyinfowidget.h +++ b/kgpg/keyinfowidget.h @@ -37,7 +37,7 @@ class KgpgKeyInfo : public KDialogBase public: - KgpgKeyInfo( TQWidget *tqparent = 0, const char *name = 0,TQString sigkey=0); + KgpgKeyInfo( TQWidget *parent = 0, const char *name = 0,TQString sigkey=0); ~KgpgKeyInfo(); KeyProperties *prop; diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp index 317eef3..5f77590 100644 --- a/kgpg/keyservers.cpp +++ b/kgpg/keyservers.cpp @@ -52,7 +52,7 @@ #include "detailedconsole.h" #include "keyservers.h" -keyServer::keyServer(TQWidget *tqparent, const char *name,bool modal,bool autoClose):KDialogBase( Swallow, i18n("Key Server"), Close, Close, tqparent, name,modal) +keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClose):KDialogBase( Swallow, i18n("Key Server"), Close, Close, parent, name,modal) { autoCloseWindow=autoClose; config=new KSimpleConfig ("kgpgrc"); diff --git a/kgpg/keyservers.h b/kgpg/keyservers.h index 9b28c11..9a5301f 100644 --- a/kgpg/keyservers.h +++ b/kgpg/keyservers.h @@ -33,7 +33,7 @@ class keyServer : public KDialogBase Q_OBJECT TQ_OBJECT public: - keyServer(TQWidget *tqparent=0, const char *name=0,bool modal=false,bool autoClose=false); + keyServer(TQWidget *parent=0, const char *name=0,bool modal=false,bool autoClose=false); ~keyServer(); keyServerWidget *page; diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index 5f1d06a..4b58ed9 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -74,8 +74,8 @@ #include "kgpglibrary.h" #include "kgpgwizard.h" -MyView::MyView( TQWidget *tqparent, const char *name ) - : TQLabel( tqparent, name ) +MyView::MyView( TQWidget *parent, const char *name ) + : TQLabel( parent, name ) { setBackgroundMode( X11ParentRelative ); openTasks=0; @@ -771,8 +771,8 @@ void MyView::help() kapp->invokeHelp(0,"kgpg"); } -kgpgapplet::kgpgapplet(TQWidget *tqparent, const char *name) - : KSystemTray(tqparent,name) +kgpgapplet::kgpgapplet(TQWidget *parent, const char *name) + : KSystemTray(parent,name) { w=new MyView(this); w->show(); @@ -782,7 +782,7 @@ kgpgapplet::kgpgapplet(TQWidget *tqparent, const char *name) KgpgSignClipboard = new KAction(i18n("&Sign/Verify Clipboard"), "signature", 0,TQT_TQOBJECT(w), TQT_SLOT(clipSign()),actionCollection(),"clip_sign"); KAction *KgpgOpenEditor; if (KGpgSettings::leftClick()==KGpgSettings::EnumLeftClick::KeyManager) - KgpgOpenEditor = new KAction(i18n("&Open Editor"), "edit", 0,TQT_TQOBJECT(tqparent), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); + KgpgOpenEditor = new KAction(i18n("&Open Editor"), "edit", 0,TQT_TQOBJECT(parent), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); else KgpgOpenEditor = new KAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenKeyManager()),actionCollection(),"kgpg_editor"); diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h index f3648f6..5fa6089 100644 --- a/kgpg/kgpg.h +++ b/kgpg/kgpg.h @@ -47,7 +47,7 @@ class MyView : public TQLabel TQ_OBJECT public: - MyView( TQWidget *tqparent = 0, const char *name = 0); + MyView( TQWidget *parent = 0, const char *name = 0); ~MyView(); KURL droppedUrl; @@ -125,7 +125,7 @@ class kgpgapplet : public KSystemTray//KUniqueApplication TQ_OBJECT public: - kgpgapplet( TQWidget *tqparent = 0, const char *name = 0); + kgpgapplet( TQWidget *parent = 0, const char *name = 0); /** destructor */ ~kgpgapplet(); MyView *w; diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp index bb6c76a..c36be3d 100644 --- a/kgpg/kgpgeditor.cpp +++ b/kgpg/kgpgeditor.cpp @@ -53,7 +53,7 @@ #include "listkeys.h" #include "kgpglibrary.h" -KgpgApp::KgpgApp(TQWidget *tqparent, const char *name, WFlags f,KShortcut goHome,bool mainWindow):KMainWindow(tqparent, name,f) +KgpgApp::KgpgApp(TQWidget *parent, const char *name, WFlags f,KShortcut goHome,bool mainWindow):KMainWindow(parent, name,f) { isMainWindow=mainWindow; textEncoding=TQString(); diff --git a/kgpg/kgpgeditor.h b/kgpg/kgpgeditor.h index c037a91..63ec59c 100644 --- a/kgpg/kgpgeditor.h +++ b/kgpg/kgpgeditor.h @@ -43,7 +43,7 @@ class KgpgApp : public KMainWindow public: /** construtor of KgpgApp, calls all init functions to create the application. */ - KgpgApp(TQWidget *tqparent=0, const char *name=0,WFlags f = 0,KShortcut goHome=TQKeySequence(CTRL+TQt::Key_Home),bool mainWindow=false); + KgpgApp(TQWidget *parent=0, const char *name=0,WFlags f = 0,KShortcut goHome=TQKeySequence(CTRL+TQt::Key_Home),bool mainWindow=false); ~KgpgApp(); /** opens a file specified by commandline option */ diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index ee28b3c..b45240d 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -611,7 +611,7 @@ TQString required; /////////////////////////////////////////////////////////////////////////////////////////////////// MD5 -Md5Widget::Md5Widget(TQWidget *tqparent, const char *name,KURL url):KDialogBase( tqparent, name, true,i18n("MD5 Checksum"),Apply | Close) +Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( parent, name, true,i18n("MD5 Checksum"),Apply | Close) { setButtonApply(i18n("Compare MD5 with Clipboard")); mdSum=TQString(); diff --git a/kgpg/kgpginterface.h b/kgpg/kgpginterface.h index 92f41fd..718c0bf 100644 --- a/kgpg/kgpginterface.h +++ b/kgpg/kgpginterface.h @@ -392,7 +392,7 @@ class Md5Widget :public KDialogBase Q_OBJECT TQ_OBJECT public: - Md5Widget(TQWidget *tqparent=0, const char *name=0,KURL url=KURL()); + Md5Widget(TQWidget *parent=0, const char *name=0,KURL url=KURL()); ~Md5Widget(); public slots: void slotApply(); diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp index cfa80da..2d7f0ad 100644 --- a/kgpg/kgpglibrary.cpp +++ b/kgpg/kgpglibrary.cpp @@ -31,14 +31,14 @@ #include "kgpginterface.h" #include <kio/renamedlg.h> -KgpgLibrary::KgpgLibrary(TQWidget *tqparent, bool pgpExtension) +KgpgLibrary::KgpgLibrary(TQWidget *parent, bool pgpExtension) { if (pgpExtension) extension=".pgp"; else extension=".gpg"; popIsActive=false; - panel=tqparent; + panel=parent; } KgpgLibrary::~KgpgLibrary() @@ -152,7 +152,7 @@ void KgpgLibrary::slotShredResult( KIO::Job * job ) emit systemMessage(TQString()); if (job && job->error()) { - job->showErrorDialog( (TQWidget*)tqparent() ); + job->showErrorDialog( (TQWidget*)parent() ); emit systemMessage(TQString(),true); KPassivePopup::message(i18n("KGpg Error"),i18n("Process halted, not all files were shredded."),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),panel,"kgpg_error",0); } diff --git a/kgpg/kgpglibrary.h b/kgpg/kgpglibrary.h index 2e626d5..e388b13 100644 --- a/kgpg/kgpglibrary.h +++ b/kgpg/kgpglibrary.h @@ -37,7 +37,7 @@ public: /** * Initialize the class */ - KgpgLibrary(TQWidget *tqparent=0,bool pgpExtension=false); + KgpgLibrary(TQWidget *parent=0,bool pgpExtension=false); ~KgpgLibrary(); KURL::List urlselecteds; diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index a4ffa36..92eecf6 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -62,8 +62,8 @@ class TQTabWidget; /////////////////////// main window -kgpgOptions::kgpgOptions(TQWidget *tqparent, const char *name) - : KConfigDialog( tqparent, name, KGpgSettings::self()) +kgpgOptions::kgpgOptions(TQWidget *parent, const char *name) + : KConfigDialog( parent, name, KGpgSettings::self()) { defaultServerList="hkp://wwwkeys.eu.pgp.net "; defaultServerList+=i18n("(Default)"); diff --git a/kgpg/kgpgoptions.h b/kgpg/kgpgoptions.h index 1f90559..5493735 100644 --- a/kgpg/kgpgoptions.h +++ b/kgpg/kgpgoptions.h @@ -41,7 +41,7 @@ class kgpgOptions : public KConfigDialog Q_OBJECT TQ_OBJECT public: - kgpgOptions(TQWidget *tqparent=0, const char *name=0); + kgpgOptions(TQWidget *parent=0, const char *name=0); ~kgpgOptions(); TQStringList names,ids; Encryption *page1; diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp index d94345f..f85563c 100644 --- a/kgpg/kgpgview.cpp +++ b/kgpg/kgpgview.cpp @@ -53,8 +53,8 @@ //////////////// configuration for editor -MyEditor::MyEditor( TQWidget *tqparent, const char *name ) - : KTextEdit( tqparent, name ) +MyEditor::MyEditor( TQWidget *parent, const char *name ) + : KTextEdit( parent, name ) { setTextFormat(PlainText); setCheckSpellingEnabled (true); @@ -190,7 +190,7 @@ void MyEditor::slotProcessResult(TQStringList iKeys) ////////////////////////// main view configuration -KgpgView::KgpgView(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name) { editor=new MyEditor(this); windowAutoClose=true; @@ -224,7 +224,7 @@ KgpgView::KgpgView(TQWidget *tqparent, const char *name) : TQWidget(tqparent, na void KgpgView::modified() { /////////////// notify for changes in editor window - KgpgApp *win=(KgpgApp *) tqparent(); + KgpgApp *win=(KgpgApp *) parent(); if (win->fileSave->isEnabled()==false) { TQString capt=win->Docname.fileName(); if (capt.isEmpty()) @@ -298,7 +298,7 @@ else editor->setText(signResult); emit resetEncoding(false); - KgpgApp *win=(KgpgApp *) tqparent(); + KgpgApp *win=(KgpgApp *) parent(); win->editRedo->setEnabled(false); win->editUndo->setEnabled(false); } @@ -311,7 +311,7 @@ void KgpgView::popuppublic() ///// popup dialog to select public key for encryption //////// open dialog --> popuppublic.cpp - popupPublic *dialogue=new popupPublic(this, "public_keys", 0,false,((KgpgApp *) tqparent())->goDefaultKey); + popupPublic *dialogue=new popupPublic(this, "public_keys", 0,false,((KgpgApp *) parent())->goDefaultKey); connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),TQT_TQOBJECT(this),TQT_SLOT(encodetxt(TQStringList,TQStringList,bool,bool))); dialogue->exec(); delete dialogue; @@ -334,7 +334,7 @@ void KgpgView::slotdecode() txtDecrypt->KgpgDecryptText(editor->text(),TQStringList::split(TQString(" "),KGpgSettings::customDecrypt().simplifyWhiteSpace())); /* - KgpgApp *win=(KgpgApp *) tqparent(); + KgpgApp *win=(KgpgApp *) parent(); if (!resultat.isEmpty()) { editor->setText(resultat); win->editRedo->setEnabled(false); diff --git a/kgpg/kgpgview.h b/kgpg/kgpgview.h index 9a61988..ac1e639 100644 --- a/kgpg/kgpgview.h +++ b/kgpg/kgpgview.h @@ -44,7 +44,7 @@ class MyEditor : public KTextEdit TQ_OBJECT public: - MyEditor( TQWidget *tqparent = 0, const char *name = 0); + MyEditor( TQWidget *parent = 0, const char *name = 0); private: TQString message,messages,tempFile; public slots: @@ -73,11 +73,11 @@ class KgpgView : public TQWidget friend class MyEditor; public: /** Constructor for the main view */ - KgpgView(TQWidget *tqparent = 0, const char *name=0); + KgpgView(TQWidget *parent = 0, const char *name=0); /** Destructor for the main view */ ~KgpgView(); - /** returns a pointer to the document connected to the view instance. Mind that this method requires a KgpgApp instance as a tqparent + /** returns a pointer to the document connected to the view instance. Mind that this method requires a KgpgApp instance as a parent * widget to get to the window document pointer by calling the KgpgApp::getDocument() method. * * @see KgpgApp#getDocument diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index 1d25ccf..75895cb 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -102,16 +102,16 @@ class UpdateViewItem : public KListViewItem { public: - UpdateViewItem(TQListView *tqparent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id,bool isdefault,bool isexpired); - UpdateViewItem(TQListViewItem *tqparent=0, TQString name=TQString(),TQString email=TQString(), TQString tr=TQString(), TQString val=TQString(), TQString size=TQString(), TQString creat=TQString(), TQString id=TQString()); + UpdateViewItem(TQListView *parent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id,bool isdefault,bool isexpired); + UpdateViewItem(TQListViewItem *parent=0, TQString name=TQString(),TQString email=TQString(), TQString tr=TQString(), TQString val=TQString(), TQString size=TQString(), TQString creat=TQString(), TQString id=TQString()); virtual void paintCell(TQPainter *p, const TQColorGroup &cg,int col, int width, int align); virtual int compare( TQListViewItem * item, int c, bool ascending ) const; virtual TQString key( int column, bool ) const; bool def,exp; }; -UpdateViewItem::UpdateViewItem(TQListView *tqparent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id,bool isdefault,bool isexpired) - : KListViewItem(tqparent) +UpdateViewItem::UpdateViewItem(TQListView *parent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id,bool isdefault,bool isexpired) + : KListViewItem(parent) { def=isdefault; exp=isexpired; @@ -124,8 +124,8 @@ UpdateViewItem::UpdateViewItem(TQListView *tqparent, TQString name,TQString emai setText(6,id); } -UpdateViewItem::UpdateViewItem(TQListViewItem *tqparent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id) - : KListViewItem(tqparent) +UpdateViewItem::UpdateViewItem(TQListViewItem *parent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id) + : KListViewItem(parent) { setText(0,name); setText(1,email); @@ -213,8 +213,8 @@ TQString UpdateViewItem::key( int column, bool ) const //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////// Secret key selection dialog, used when user wants to sign a key -KgpgSelKey::KgpgSelKey(TQWidget *tqparent, const char *name,bool allowMultipleSelection, TQString preselected): -KDialogBase( tqparent, name, true,i18n("Private Key List"),Ok | Cancel) +KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool allowMultipleSelection, TQString preselected): +KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel) { TQString keyname; page = new TQWidget(this); @@ -352,8 +352,8 @@ void KgpgSelKey::slotSelect(TQListViewItem *item) if (item==NULL) return; if (item->depth()!=0) { - keysListpr->setSelected(item->tqparent(),true); - keysListpr->setCurrentItem(item->tqparent()); + keysListpr->setSelected(item->parent(),true); + keysListpr->setCurrentItem(item->parent()); } } @@ -392,8 +392,8 @@ TQString KgpgSelKey::getkeyMail() ///////////////////////////////////////////////////////////////////////////////////////////// -KeyView::KeyView( TQWidget *tqparent, const char *name ) - : KListView( tqparent, name ) +KeyView::KeyView( TQWidget *parent, const char *name ) + : KListView( parent, name ) { KIconLoader *loader = KGlobal::iconLoader(); @@ -476,8 +476,8 @@ void KeyView::startDrag() } -mySearchLine::mySearchLine(TQWidget *tqparent, KeyView *listView, const char *name) -:KListViewSearchLine(tqparent,listView,name) +mySearchLine::mySearchLine(TQWidget *parent, KeyView *listView, const char *name) +:KListViewSearchLine(parent,listView,name) { searchListView=listView; setKeepParentsVisible(false); @@ -519,7 +519,7 @@ void mySearchLine::updateSearch(const TQString& s) /////////////////////////////////////////////////////////////////////////////////////// main window for key management -listKeys::listKeys(TQWidget *tqparent, const char *name) : DCOPObject( "KeyInterface" ), KMainWindow(tqparent, name,0) +listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterface" ), KMainWindow(parent, name,0) { //KWin::setType(TQt::WDestructiveClose); @@ -721,7 +721,7 @@ listKeys::listKeys(TQWidget *tqparent, const char *name) : DCOPObject( "KeyInter TQObject::connect(keysList2,TQT_SIGNAL(statusMessage(TQString,int,bool)),TQT_TQOBJECT(this),TQT_SLOT(changeMessage(TQString,int,bool))); TQObject::connect(statusbarTimer,TQT_SIGNAL(timeout()),TQT_TQOBJECT(this),TQT_SLOT(statusBarTimeout())); - s_kgpgEditor= new KgpgApp(tqparent, "editor",WType_Dialog,actionCollection()->action("go_default_key")->shortcut(),true); + s_kgpgEditor= new KgpgApp(parent, "editor",WType_Dialog,actionCollection()->action("go_default_key")->shortcut(),true); connect(s_kgpgEditor,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); connect(this,TQT_SIGNAL(fontChanged(TQFont)),s_kgpgEditor,TQT_SLOT(slotSetFont(TQFont))); connect(s_kgpgEditor->view->editor,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); @@ -887,7 +887,7 @@ void listKeys::slotDelUid() { TQListViewItem *item=keysList2->currentItem(); while (item->depth()>0) - item=item->tqparent(); + item=item->parent(); KProcess *conprocess=new KProcess(); KConfig *config = KGlobal::config(); @@ -966,11 +966,11 @@ 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>").tqarg(keysList2->currentItem()->text(6)).tqarg(keysList2->currentItem()->tqparent()->text(0)).tqarg(keysList2->currentItem()->tqparent()->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(); - delPhotoProcess->KgpgDeletePhoto(keysList2->currentItem()->tqparent()->text(6),keysList2->currentItem()->text(6)); + delPhotoProcess->KgpgDeletePhoto(keysList2->currentItem()->parent()->text(6),keysList2->currentItem()->text(6)); connect(delPhotoProcess,TQT_SIGNAL(delPhotoFinished()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdatePhoto())); connect(delPhotoProcess,TQT_SIGNAL(delPhotoError(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotGpgError(TQString))); } @@ -1085,7 +1085,7 @@ void listKeys::findNextKey() if (!item) return; while(item->depth() > 0) - item = item->tqparent(); + item = item->parent(); item=item->nextSibling(); TQString searchText=item->text(0)+" "+item->text(1)+" "+item->text(6); //kdDebug(2100)<<"Next string:"<<searchText<<endl; @@ -1610,7 +1610,7 @@ void listKeys::slotShowPhoto() KService::Ptr ptr = offers.first(); //KMessageBox::sorry(0,ptr->desktopEntryName()); KProcIO *p=new KProcIO(TQTextCodec::codecForLocale()); - *p<<"gpg"<<"--no-tty"<<"--photo-viewer"<<TQString(TQFile::encodeName(ptr->desktopEntryName()+" %i"))<<"--edit-key"<<keysList2->currentItem()->tqparent()->text(6)<<"uid"<<keysList2->currentItem()->text(6)<<"showphoto"<<"quit"; + *p<<"gpg"<<"--no-tty"<<"--photo-viewer"<<TQString(TQFile::encodeName(ptr->desktopEntryName()+" %i"))<<"--edit-key"<<keysList2->currentItem()->parent()->text(6)<<"uid"<<keysList2->currentItem()->text(6)<<"showphoto"<<"quit"; p->start(KProcess::DontCare,true); } @@ -2055,9 +2055,9 @@ void listKeys::delsignkey() TQString signID,parentKey,signMail,parentMail; ////////////////// open a key selection dialog (KgpgSelKey, see begining of this file) - parentKey=keysList2->currentItem()->tqparent()->text(6); + parentKey=keysList2->currentItem()->parent()->text(6); signID=keysList2->currentItem()->text(6); - parentMail=keysList2->currentItem()->tqparent()->text(0)+" ("+keysList2->currentItem()->tqparent()->text(1)+")"; + parentMail=keysList2->currentItem()->parent()->text(0)+" ("+keysList2->currentItem()->parent()->text(1)+")"; signMail=keysList2->currentItem()->text(0)+" ("+keysList2->currentItem()->text(1)+")"; if (parentKey==signID) { @@ -2078,7 +2078,7 @@ void listKeys::delsignatureResult(bool success) if (success) { TQListViewItem *top=keysList2->currentItem(); while (top->depth()!=0) - top=top->tqparent(); + top=top->parent(); while (top->firstChild()!=0) delete top->firstChild(); keysList2->refreshcurrentkey(top); @@ -2143,7 +2143,7 @@ void listKeys::slotgenkey() goodpass=true; } - pop = new KPassivePopup((TQWidget *)tqparent(),"new_key"); + pop = new KPassivePopup((TQWidget *)parent(),"new_key"); pop->setTimeout(0); TQWidget *wid=new TQWidget(pop); @@ -2672,7 +2672,7 @@ void KeyView::refreshkeylist() TQListViewItem *current = currentItem(); if(current != NULL) { while(current->depth() > 0) { - current = current->tqparent(); + current = current->parent(); } takeItem(current); } @@ -2865,7 +2865,7 @@ void KeyView::refreshselfkey() if (currentItem()->depth()==0) refreshcurrentkey(currentItem()); else - refreshcurrentkey(currentItem()->tqparent()); + refreshcurrentkey(currentItem()->parent()); } void KeyView::slotReloadKeys(TQStringList keyIDs) diff --git a/kgpg/listkeys.h b/kgpg/listkeys.h index 69e64e4..abb2689 100644 --- a/kgpg/listkeys.h +++ b/kgpg/listkeys.h @@ -71,7 +71,7 @@ class KgpgSelKey : public KDialogBase TQ_OBJECT public: - KgpgSelKey( TQWidget *tqparent = 0, const char *name = 0,bool allowMultipleSelection=false, TQString preselected=TQString()); + KgpgSelKey( TQWidget *parent = 0, const char *name = 0,bool allowMultipleSelection=false, TQString preselected=TQString()); KListView *keysListpr; TQPixmap keyPair; TQCheckBox *local; @@ -95,7 +95,7 @@ class KeyView : public KListView TQ_OBJECT friend class listKeys; public: - KeyView( TQWidget *tqparent = 0, const char *name = 0); + KeyView( TQWidget *parent = 0, const char *name = 0); bool displayPhoto,displayOnlySecret,displayDisabled; int previewSize; TQString secretList; @@ -146,7 +146,7 @@ class mySearchLine: public KListViewSearchLine Q_OBJECT TQ_OBJECT public: - mySearchLine(TQWidget *tqparent = 0, KeyView *listView = 0, const char *name = 0); + mySearchLine(TQWidget *parent = 0, KeyView *listView = 0, const char *name = 0); virtual ~mySearchLine(); private: KeyView *searchListView; @@ -165,7 +165,7 @@ class listKeys : public KMainWindow, virtual public KeyInterface TQ_OBJECT public: - listKeys(TQWidget *tqparent=0, const char *name=0); + listKeys(TQWidget *parent=0, const char *name=0); ~listKeys(); TQLabel *keyPhoto; KeyView *keysList2; diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index 20b651a..89a25ae 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -54,14 +54,14 @@ class UpdateViewItem2 : public KListViewItem { public: - UpdateViewItem2(TQListView *tqparent, TQString name,TQString mail,TQString id,bool isDefault); + UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault); virtual void paintCell(TQPainter *p, const TQColorGroup &cg,int col, int width, int align); virtual TQString key(int c,bool ) const; bool def; }; -UpdateViewItem2::UpdateViewItem2(TQListView *tqparent, TQString name,TQString mail,TQString id,bool isDefault) - : KListViewItem(tqparent) +UpdateViewItem2::UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault) + : KListViewItem(parent) { def=isDefault; setText(0,name); @@ -87,8 +87,8 @@ TQString UpdateViewItem2 :: key(int c,bool ) const /////////////// main view -popupPublic::popupPublic(TQWidget *tqparent, const char *name,TQString sfile,bool filemode,KShortcut goDefaultKey): -KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, tqparent, name,true) +popupPublic::popupPublic(TQWidget *parent, const char *name,TQString sfile,bool filemode,KShortcut goDefaultKey): +KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent, name,true) { TQWidget *page = plainPage(); diff --git a/kgpg/popuppublic.h b/kgpg/popuppublic.h index 842d8a9..06d7b01 100644 --- a/kgpg/popuppublic.h +++ b/kgpg/popuppublic.h @@ -35,7 +35,7 @@ class popupPublic : public KDialogBase //TQDialog TQ_OBJECT public: - popupPublic(TQWidget *tqparent=0, const char *name=0,TQString sfile="",bool filemode=false,KShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home)); + popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,KShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home)); ~popupPublic(); KListView *keysList; TQCheckBox *CBarmor,*CBuntrusted,*CBshred,*CBsymmetric,*CBhideid; diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cc index 20d4039..7e7f14c 100644 --- a/khexedit/bitswapwidget.cc +++ b/khexedit/bitswapwidget.cc @@ -24,8 +24,8 @@ #include "bitswapwidget.h" -CDigitLabel::CDigitLabel( TQWidget *tqparent, uint digit, const char *name ) - :TQLabel(tqparent, name), mDigit( digit ), mDotPosition( 0 ) +CDigitLabel::CDigitLabel( TQWidget *parent, uint digit, const char *name ) + :TQLabel(parent, name), mDigit( digit ), mDotPosition( 0 ) { setFocusPolicy( TQ_StrongFocus ); initialize(); @@ -174,8 +174,8 @@ void CDigitLabel::keyPressEvent( TQKeyEvent *e ) -CByteWidget::CByteWidget( TQWidget *tqparent, const char *name ) - :TQWidget(tqparent, name) +CByteWidget::CByteWidget( TQWidget *parent, const char *name ) + :TQWidget(parent, name) { mHBox = new TQHBoxLayout( this, 0 ); diff --git a/khexedit/bitswapwidget.h b/khexedit/bitswapwidget.h index 14d6ab2..0dfccbf 100644 --- a/khexedit/bitswapwidget.h +++ b/khexedit/bitswapwidget.h @@ -32,7 +32,7 @@ class CDigitLabel : public TQLabel TQ_OBJECT public: - CDigitLabel( TQWidget *tqparent, uint digit = 0, const char *name=0 ); + CDigitLabel( TQWidget *parent, uint digit = 0, const char *name=0 ); ~CDigitLabel( void ); virtual TQSize tqsizeHint() const; @@ -74,7 +74,7 @@ class CByteWidget : public TQWidget TQ_OBJECT public: - CByteWidget( TQWidget *tqparent, const char *name=0 ); + CByteWidget( TQWidget *parent, const char *name=0 ); ~CByteWidget( void ); bool flag( TQByteArray &buf ); diff --git a/khexedit/chartabledialog.cc b/khexedit/chartabledialog.cc index a249325..4475604 100644 --- a/khexedit/chartabledialog.cc +++ b/khexedit/chartabledialog.cc @@ -32,10 +32,10 @@ #include "chartabledialog.h" -CCharTableDialog::CCharTableDialog( TQWidget *tqparent, const char *name, +CCharTableDialog::CCharTableDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Character Table"), Help|User1|Cancel, User1, - tqparent, name, modal, true, KStdGuiItem::insert()) + parent, name, modal, true, KStdGuiItem::insert()) { updateGeometry(); setHelp( "khexedit/khexedit.html", TQString() ); diff --git a/khexedit/chartabledialog.h b/khexedit/chartabledialog.h index ac829e7..6b7610b 100644 --- a/khexedit/chartabledialog.h +++ b/khexedit/chartabledialog.h @@ -38,7 +38,7 @@ class CCharTableDialog : public KDialogBase TQ_OBJECT public: - CCharTableDialog( TQWidget *tqparent=0, const char *name=0,bool modal=false ); + CCharTableDialog( TQWidget *parent=0, const char *name=0,bool modal=false ); ~CCharTableDialog( void ); signals: diff --git a/khexedit/converterdialog.cc b/khexedit/converterdialog.cc index 3452c4f..6f3a82e 100644 --- a/khexedit/converterdialog.cc +++ b/khexedit/converterdialog.cc @@ -28,9 +28,9 @@ #include "hexvalidator.h" -CValidateLineEdit::CValidateLineEdit( TQWidget *tqparent, int validateType, +CValidateLineEdit::CValidateLineEdit( TQWidget *parent, int validateType, const char *name ) - :TQLineEdit( tqparent, name ), mBusy(false) + :TQLineEdit( parent, name ), mBusy(false) { mValidator = new CHexValidator( this, (CHexValidator::EState)validateType ); setValidator( mValidator ); @@ -66,9 +66,9 @@ void CValidateLineEdit::convertText( const TQString &text ) -CConverterDialog::CConverterDialog( TQWidget *tqparent, const char *name, +CConverterDialog::CConverterDialog( TQWidget *parent, const char *name, bool modal ) - :KDialogBase( tqparent, name, modal, i18n("Converter"), Cancel|User2|User1, + :KDialogBase( parent, name, modal, i18n("Converter"), Cancel|User2|User1, Cancel, true, KStdGuiItem::clear(), i18n("&On Cursor") ) { TQWidget *page = new TQWidget( this ); diff --git a/khexedit/converterdialog.h b/khexedit/converterdialog.h index d5e8d7e..544517b 100644 --- a/khexedit/converterdialog.h +++ b/khexedit/converterdialog.h @@ -33,7 +33,7 @@ class CValidateLineEdit : public TQLineEdit TQ_OBJECT public: - CValidateLineEdit( TQWidget *tqparent, int validateType, const char *name=0 ); + CValidateLineEdit( TQWidget *parent, int validateType, const char *name=0 ); ~CValidateLineEdit( void ); public slots: @@ -57,7 +57,7 @@ class CConverterDialog : public KDialogBase TQ_OBJECT public: - CConverterDialog( TQWidget *tqparent, const char *name=0, bool modal=true ); + CConverterDialog( TQWidget *parent, const char *name=0, bool modal=true ); ~CConverterDialog( void ); protected: diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc index df9296c..e04bb30 100644 --- a/khexedit/dialog.cc +++ b/khexedit/dialog.cc @@ -40,8 +40,8 @@ static const TQStringList &formatStrings( void ); static const TQStringList &operationStrings( void ); -CGotoDialog::CGotoDialog( TQWidget *tqparent, const char *name, bool modal ) - :KDialogBase( Plain, i18n("Goto Offset"), Ok|Cancel, Ok, tqparent, name, +CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal ) + :KDialogBase( Plain, i18n("Goto Offset"), Ok|Cancel, Ok, parent, name, modal ) { TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); @@ -174,8 +174,8 @@ void CGotoDialog::slotOk( void ) -CFindDialog::CFindDialog( TQWidget *tqparent, const char *name, bool modal ) - :KDialogBase( Plain, i18n("Find"), Ok|Cancel, Ok, tqparent, name, modal ) +CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal ) + :KDialogBase( Plain, i18n("Find"), Ok|Cancel, Ok, parent, name, modal ) { TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); @@ -343,10 +343,10 @@ void CFindDialog::findAgain( EOperation operation ) -CFindNavigatorDialog::CFindNavigatorDialog( TQWidget *tqparent, const char *name, +CFindNavigatorDialog::CFindNavigatorDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Find (Navigator)"), User3|User2|User1|Close, - User2, tqparent, name, modal, true, i18n("New &Key"), + User2, parent, name, modal, true, i18n("New &Key"), i18n("&Next"), i18n("&Previous") ) { TQString text; @@ -481,9 +481,9 @@ void CFindNavigatorDialog::done( int resultCode ) -CReplaceDialog::CReplaceDialog( TQWidget *tqparent, const char *name, bool modal ) +CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Find & Replace"), Ok|Cancel, Ok, - tqparent, name, modal ) + parent, name, modal ) { TQString text; TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); @@ -676,10 +676,10 @@ void CReplaceDialog::slotOk( void ) -CReplacePromptDialog::CReplacePromptDialog( TQWidget *tqparent, const char *name, +CReplacePromptDialog::CReplacePromptDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Find & Replace"), User3|User2|User1|Close, - User2, tqparent, name, modal, true, i18n("Replace &All"), + User2, parent, name, modal, true, i18n("Replace &All"), i18n("Do Not Replace"), i18n("Replace")) { TQString text; @@ -757,9 +757,9 @@ void CReplacePromptDialog::done( int returnCode ) -CFilterDialog::CFilterDialog( TQWidget *tqparent, const char *name, bool modal ) +CFilterDialog::CFilterDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Binary Filter"), Ok|Cancel, Ok, - tqparent, name, modal ) + parent, name, modal ) { TQString text; TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); @@ -1066,9 +1066,9 @@ void CFilterDialog::operationSelectorChanged( int index ) -CInsertDialog::CInsertDialog( TQWidget *tqparent, const char *name, bool modal ) +CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) :KDialogBase( Plain, i18n("Insert Pattern"), Ok|Cancel, Ok, - tqparent, name, modal ) + parent, name, modal ) { setButtonOKText(i18n("&Insert")); @@ -1278,7 +1278,7 @@ void comboMatchText( TQComboBox *combo, const TQString &text ) -void showEntryFailure( TQWidget *tqparent, const TQString &msg ) +void showEntryFailure( TQWidget *parent, const TQString &msg ) { TQString message; message += i18n("Your request can not be processed."); @@ -1291,17 +1291,17 @@ void showEntryFailure( TQWidget *tqparent, const TQString &msg ) { message += msg; } - KMessageBox::sorry( tqparent, message, i18n("Invalid argument(s)") ); + KMessageBox::sorry( parent, message, i18n("Invalid argument(s)") ); } -bool verifyFileDestnation( TQWidget *tqparent, const TQString &title, +bool verifyFileDestnation( TQWidget *parent, const TQString &title, const TQString &path ) { if( path.isEmpty() == true ) { TQString msg = i18n("You must specify a destination file."); - KMessageBox::sorry( tqparent, msg, title ); + KMessageBox::sorry( parent, msg, title ); return( false ); } @@ -1311,21 +1311,21 @@ bool verifyFileDestnation( TQWidget *tqparent, const TQString &title, if( info.isDir() == true ) { TQString msg = i18n("You have specified an existing folder."); - KMessageBox::sorry( tqparent, msg, title ); + KMessageBox::sorry( parent, msg, title ); return( false ); } if( info.isWritable() == false ) { TQString msg = i18n("You do not have write permission to this file."); - KMessageBox::sorry( tqparent, msg, title ); + KMessageBox::sorry( parent, msg, title ); return( false ); } TQString msg = i18n( "" "You have specified an existing file.\n" "Overwrite current file?" ); - int reply = KMessageBox::warningContinueCancel( tqparent, msg, title, i18n("Overwrite") ); + int reply = KMessageBox::warningContinueCancel( parent, msg, title, i18n("Overwrite") ); if( reply != KMessageBox::Continue ) { return( false ); diff --git a/khexedit/dialog.h b/khexedit/dialog.h index 12456be..61b4633 100644 --- a/khexedit/dialog.h +++ b/khexedit/dialog.h @@ -67,7 +67,7 @@ class CGotoDialog : public KDialogBase TQ_OBJECT public: - CGotoDialog( TQWidget *tqparent, const char *name = 0, bool modal = false ); + CGotoDialog( TQWidget *parent, const char *name = 0, bool modal = false ); ~CGotoDialog( void ); protected: @@ -102,7 +102,7 @@ class CFindDialog : public KDialogBase }; public: - CFindDialog( TQWidget *tqparent=0, const char *name=0, bool modal=false ); + CFindDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); ~CFindDialog( void ); bool isEmpty( void ); @@ -142,7 +142,7 @@ class CFindNavigatorDialog : public KDialogBase TQ_OBJECT public: - CFindNavigatorDialog( TQWidget *tqparent=0, const char *name=0, + CFindNavigatorDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); ~CFindNavigatorDialog( void ); void defineData( SSearchControl &sc ); @@ -172,7 +172,7 @@ class CReplaceDialog : public KDialogBase TQ_OBJECT public: - CReplaceDialog( TQWidget *tqparent=0, const char *name=0, bool modal=false ); + CReplaceDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); ~CReplaceDialog( void ); protected: @@ -216,7 +216,7 @@ class CReplacePromptDialog : public KDialogBase TQ_OBJECT public: - CReplacePromptDialog( TQWidget *tqparent=0, const char *name=0, + CReplacePromptDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); ~CReplacePromptDialog( void ); void defineData( SSearchControl &sc ); @@ -255,7 +255,7 @@ class CFilterDialog : public KDialogBase }; public: - CFilterDialog( TQWidget *tqparent=0, const char *name=0, bool modal=false ); + CFilterDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); ~CFilterDialog( void ); protected: @@ -306,7 +306,7 @@ class CInsertDialog : public KDialogBase TQ_OBJECT public: - CInsertDialog( TQWidget *tqparent=0, const char *name=0, bool modal=false ); + CInsertDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); ~CInsertDialog( void ); protected: @@ -343,8 +343,8 @@ void centerDialogBottom( TQWidget *widget, TQWidget *centerParent ); void comboMatchText( TQComboBox *combo, const TQString &text ); bool stringToOffset( const TQString & text, uint &offset ); -void showEntryFailure( TQWidget *tqparent, const TQString &msg ); -bool verifyFileDestnation( TQWidget *tqparent, const TQString &title, +void showEntryFailure( TQWidget *parent, const TQString &msg ); +bool verifyFileDestnation( TQWidget *parent, const TQString &title, const TQString &path ); diff --git a/khexedit/draglabel.cc b/khexedit/draglabel.cc index b404f8e..564521f 100644 --- a/khexedit/draglabel.cc +++ b/khexedit/draglabel.cc @@ -28,8 +28,8 @@ #include "draglabel.h" -CDragLabel::CDragLabel( TQWidget *tqparent ) - : TQLabel( "draglabel", tqparent, "kde toolbar widget" ) +CDragLabel::CDragLabel( TQWidget *parent ) + : TQLabel( "draglabel", parent, "kde toolbar widget" ) { mValid = true; mDragPending = false; @@ -120,12 +120,12 @@ void CDragLabel::prepPixmap( KURLDrag &uriDrag ) int h = fontMetrics().lineSpacing(); if( pixmap()->height() > h ) { h = pixmap()->height(); } - TQBitmap tqmask( w, h, TRUE ); + TQBitmap mask( w, h, TRUE ); TQPixmap dragPixmap( w, h ); dragPixmap.fill( black ); TQPainter p; - p.begin( &tqmask ); + p.begin( &mask ); p.setPen( white ); p.drawPixmap( 0, 0, mDragMask ); p.drawText( pixmap()->width()+sep, 0, w-pixmap()->width()+sep, @@ -136,7 +136,7 @@ void CDragLabel::prepPixmap( KURLDrag &uriDrag ) p.drawPixmap( 0, 0, *pixmap() ); p.end(); - dragPixmap.setMask( tqmask ); + dragPixmap.setMask( mask ); TQPoint hotspot( pixmap()->width(), pixmap()->height()/2 ); uriDrag.setPixmap( dragPixmap, hotspot ); diff --git a/khexedit/draglabel.h b/khexedit/draglabel.h index 16176f0..44f355b 100644 --- a/khexedit/draglabel.h +++ b/khexedit/draglabel.h @@ -35,7 +35,7 @@ class CDragLabel: public TQLabel TQ_OBJECT public: - CDragLabel( TQWidget *tqparent ); + CDragLabel( TQWidget *parent ); ~CDragLabel( void ); void setUrl( const TQString &url ); diff --git a/khexedit/exportdialog.cc b/khexedit/exportdialog.cc index 7ea3573..d5b90e1 100644 --- a/khexedit/exportdialog.cc +++ b/khexedit/exportdialog.cc @@ -31,9 +31,9 @@ #include <tqpushbutton.h> -CExportDialog::CExportDialog( TQWidget *tqparent, char *name, bool modal ) +CExportDialog::CExportDialog( TQWidget *parent, char *name, bool modal ) :KDialogBase( Tabbed, i18n("Export Document"), Help|Ok|Cancel, Ok, - tqparent, name, modal ) + parent, name, modal ) { setHelp( "khexedit/khexedit.html", TQString() ); diff --git a/khexedit/exportdialog.h b/khexedit/exportdialog.h index 52adac8..ee89134 100644 --- a/khexedit/exportdialog.h +++ b/khexedit/exportdialog.h @@ -58,7 +58,7 @@ class CExportDialog : public KDialogBase option_max }; - CExportDialog( TQWidget *tqparent = 0, char *name = 0, bool modal = false ); + CExportDialog( TQWidget *parent = 0, char *name = 0, bool modal = false ); ~CExportDialog( void ); void writeConfiguration( void ); diff --git a/khexedit/fileinfodialog.cc b/khexedit/fileinfodialog.cc index 08fa5b1..957f1d7 100644 --- a/khexedit/fileinfodialog.cc +++ b/khexedit/fileinfodialog.cc @@ -33,10 +33,10 @@ class CStatisticListViewItem : public TQListViewItem { public: - CStatisticListViewItem( TQListView * tqparent, TQListViewItem * after, + CStatisticListViewItem( TQListView * parent, TQListViewItem * after, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, int i, int o) - : TQListViewItem( tqparent, after, label1, label2, label3, label4, label5, label6, label7), + : TQListViewItem( parent, after, label1, label2, label3, label4, label5, label6, label7), item( i ), occurrence( o ) {} @@ -69,9 +69,9 @@ class CStatisticListViewItem : public TQListViewItem -CFileInfoDialog::CFileInfoDialog( TQWidget *tqparent,const char *name,bool modal) +CFileInfoDialog::CFileInfoDialog( TQWidget *parent,const char *name,bool modal) :KDialogBase( Plain, i18n("Statistics"), Help|User1|Cancel, User1, - tqparent, name, modal, true, i18n("&Update") ), + parent, name, modal, true, i18n("&Update") ), mBusy(false), mDirty(false) { setHelp( "khexedit/khexedit.html", TQString() ); diff --git a/khexedit/fileinfodialog.h b/khexedit/fileinfodialog.h index 5c8528f..816c972 100644 --- a/khexedit/fileinfodialog.h +++ b/khexedit/fileinfodialog.h @@ -39,7 +39,7 @@ class CFileInfoDialog : public KDialogBase TQ_OBJECT public: - CFileInfoDialog( TQWidget *tqparent=0, const char *name=0,bool modal=false ); + CFileInfoDialog( TQWidget *parent=0, const char *name=0,bool modal=false ); ~CFileInfoDialog( void ); void setStatistics( void ); diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc index 25c1330..dcfdd91 100644 --- a/khexedit/hexbuffer.cc +++ b/khexedit/hexbuffer.cc @@ -1609,7 +1609,7 @@ void CHexBuffer::drawText( TQPainter &paint, uint line, int sx, int x1, int x2 ) // // Draw the bookmark identifiers on this line (if any). We use the - // bittqmask to minimize the number of times we try to draw the bookmarks. + // bitmask to minimize the number of times we try to draw the bookmarks. // int bookmarkPosition = 0; if( mBookmarkMap.testBit(fileOffset/200) || diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc index 5b17d60..6235e09 100644 --- a/khexedit/hexeditorwidget.cc +++ b/khexedit/hexeditorwidget.cc @@ -47,8 +47,8 @@ -CHexEditorWidget::CHexEditorWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +CHexEditorWidget::CHexEditorWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { CHexBuffer *hexBuffer = new CHexBuffer; if( hexBuffer == 0 ) { return; } diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h index 92491e5..def98e0 100644 --- a/khexedit/hexeditorwidget.h +++ b/khexedit/hexeditorwidget.h @@ -71,7 +71,7 @@ class CHexEditorWidget : public TQWidget }; public: - CHexEditorWidget( TQWidget *tqparent = 0, const char *name = 0 ); + CHexEditorWidget( TQWidget *parent = 0, const char *name = 0 ); ~CHexEditorWidget( void ); void initialize( void ); diff --git a/khexedit/hexmanagerwidget.cc b/khexedit/hexmanagerwidget.cc index 40f72fe..0059c0a 100644 --- a/khexedit/hexmanagerwidget.cc +++ b/khexedit/hexmanagerwidget.cc @@ -23,11 +23,11 @@ #include "hexmanagerwidget.h" #include "searchbar.h" -CHexManagerWidget::CHexManagerWidget( TQWidget *tqparent, const char *name, +CHexManagerWidget::CHexManagerWidget( TQWidget *parent, const char *name, EConversionPosition conversionPosition, EPosition tabBarPosition, EPosition searchBarPosition ) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { mValid = false; @@ -258,8 +258,8 @@ int CHexManagerWidget::preferredWidth( void ) -CTabBar::CTabBar( TQWidget *tqparent, char *name ) - :TQTabBar( tqparent, name ) +CTabBar::CTabBar( TQWidget *parent, char *name ) + :TQTabBar( parent, name ) { connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotSelected(int)) ); } diff --git a/khexedit/hexmanagerwidget.h b/khexedit/hexmanagerwidget.h index e4b4652..b04fbc8 100644 --- a/khexedit/hexmanagerwidget.h +++ b/khexedit/hexmanagerwidget.h @@ -78,7 +78,7 @@ class CTabBar : public TQTabBar TQ_OBJECT public: - CTabBar( TQWidget *tqparent=0, char *name=0 ); + CTabBar( TQWidget *parent=0, char *name=0 ); void addName( const TQString &name ); void removeName( const TQString &name ); void changeName( const TQString &curName, const TQString &newName ); @@ -119,7 +119,7 @@ class CHexManagerWidget : public TQWidget }; public: - CHexManagerWidget( TQWidget *tqparent = 0, const char *name = 0, + CHexManagerWidget( TQWidget *parent = 0, const char *name = 0, EConversionPosition state = Embed, EPosition tabBarPosition = HideItem, EPosition searchBarPosition = HideItem ); diff --git a/khexedit/hextoolwidget.cc b/khexedit/hextoolwidget.cc index 7c80583..48a6a08 100644 --- a/khexedit/hextoolwidget.cc +++ b/khexedit/hextoolwidget.cc @@ -29,8 +29,8 @@ #include <tqcombobox.h> -CHexToolWidget::CHexToolWidget( TQWidget *tqparent, const char *name ) - : TQFrame( tqparent, name ) +CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) + : TQFrame( parent, name ) { setFrameStyle( TQFrame::Panel | TQFrame::Raised ); setLineWidth( 1 ); @@ -192,7 +192,7 @@ void CHexToolWidget::bitWidthChanged( int /*i*/ ) // unsigned long CHexToolWidget::bitValue( SCursorState &state, int n ) { - static const unsigned char bittqmask[9] = + static const unsigned char bitmask[9] = { 0, 1<<7, 3<<6, 7<<5, 15<<4, 31<<3, 63<<2, 127<<1, 255 }; @@ -217,9 +217,9 @@ unsigned long CHexToolWidget::bitValue( SCursorState &state, int n ) int this_time = ((8-bit)>=n)?n:(8-bit); // - // tqmask to get only the bit's we're swallowing + // mask to get only the bit's we're swallowing // - c &= bittqmask[this_time]; + c &= bitmask[this_time]; // // shift down to get bit's in low part of byte diff --git a/khexedit/hextoolwidget.h b/khexedit/hextoolwidget.h index 2c2abe5..cdaaad6 100644 --- a/khexedit/hextoolwidget.h +++ b/khexedit/hextoolwidget.h @@ -37,7 +37,7 @@ class CHexToolWidget : public TQFrame TQ_OBJECT public: - CHexToolWidget( TQWidget *tqparent = 0, const char *name = 0 ); + CHexToolWidget( TQWidget *parent = 0, const char *name = 0 ); ~CHexToolWidget( void ); void writeConfiguration( KConfig &config ); diff --git a/khexedit/hexvalidator.cc b/khexedit/hexvalidator.cc index 28325a9..74126e7 100644 --- a/khexedit/hexvalidator.cc +++ b/khexedit/hexvalidator.cc @@ -23,9 +23,9 @@ #include <tqwidget.h> #include "hexvalidator.h" -CHexValidator::CHexValidator( TQWidget *tqparent, EState state, +CHexValidator::CHexValidator( TQWidget *parent, EState state, const char *name ) - :TQValidator( TQT_TQOBJECT(tqparent), name ) + :TQValidator( TQT_TQOBJECT(parent), name ) { setState( state ); } diff --git a/khexedit/hexvalidator.h b/khexedit/hexvalidator.h index 551bc4f..387fcbe 100644 --- a/khexedit/hexvalidator.h +++ b/khexedit/hexvalidator.h @@ -39,7 +39,7 @@ class CHexValidator: public TQValidator }; public: - CHexValidator( TQWidget *tqparent, EState state, const char *name = 0 ); + CHexValidator( TQWidget *parent, EState state, const char *name = 0 ); ~CHexValidator( void ); TQValidator::State validate( TQString &string, int &pos ) const; void setState( EState state ); diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc index ca2edd2..555e0cc 100644 --- a/khexedit/hexviewwidget.cc +++ b/khexedit/hexviewwidget.cc @@ -165,11 +165,11 @@ void CDragManager::setupTimer( void ) // -// This widget will use the entire space of the tqparent widget +// This widget will use the entire space of the parent widget // -CHexViewWidget::CHexViewWidget( TQWidget *tqparent, const char *name, +CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name, CHexBuffer *hexBuffer ) - : TQFrame( tqparent, name, + : TQFrame( parent, name, #ifdef USE_NORTHWEST_GRAVITY TQt::WStaticContents #else @@ -177,7 +177,7 @@ CHexViewWidget::CHexViewWidget( TQWidget *tqparent, const char *name, #endif ), mScrollBarSize( 16 ) { - if( tqparent == 0 || hexBuffer == 0 ) { return; } + if( parent == 0 || hexBuffer == 0 ) { return; } // // TQt 2.0: @@ -967,10 +967,10 @@ void CHexViewWidget::copy( void ) disconnect(TQApplication::tqclipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); // - // Note: Do no give the CHexDrag a tqparent != 0. The clipboard + // Note: Do no give the CHexDrag a parent != 0. The clipboard // owns the current dragdata and will destroy it on exit or - // when it receives a new object. If the CHexDrag has a tqparent - // != 0, the CHexDrag object will be destroyed when the tqparent + // when it receives a new object. If the CHexDrag has a parent + // != 0, the CHexDrag object will be destroyed when the parent // is destroyed. We will then have a double destroy situation // when the app. is closed (=> segfault). // @@ -1670,7 +1670,7 @@ void CHexViewWidget::dropEvent( TQDropEvent *e ) { // // This widget can not itself open a file so it will simply pass - // the request to a tqparent that can (hopefully) do this + // the request to a parent that can (hopefully) do this // for( KURL::List::ConstIterator it = list.begin(); it != list.end(); it++ ) { diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h index 65f1164..1e3f02c 100644 --- a/khexedit/hexviewwidget.h +++ b/khexedit/hexviewwidget.h @@ -43,8 +43,8 @@ class CScrollBar : public TQScrollBar TQ_OBJECT public: - CScrollBar( Qt::Orientation o, TQWidget *tqparent, const char *name = 0 ) - : TQScrollBar( o, tqparent, name ) + CScrollBar( Qt::Orientation o, TQWidget *parent, const char *name = 0 ) + : TQScrollBar( o, parent, name ) { } @@ -103,7 +103,7 @@ class CHexViewWidget : public TQFrame TQ_OBJECT public: - CHexViewWidget( TQWidget *tqparent, const char *name, CHexBuffer *hexBuffer ); + CHexViewWidget( TQWidget *parent, const char *name, CHexBuffer *hexBuffer ); ~CHexViewWidget( void ); inline bool widgetValid( void ); diff --git a/khexedit/lib/kbytesedit.h b/khexedit/lib/kbytesedit.h index defb734..915276b 100644 --- a/khexedit/lib/kbytesedit.h +++ b/khexedit/lib/kbytesedit.h @@ -70,7 +70,7 @@ class KHEXEDIT_EXPORT KBytesEdit : public KHexEdit * @param S size of used memory * @param RS_ real size of the memory * @param KM keep the memory on resize (RS_ is then the maximum size) - * @param Parent tqparent widget + * @param Parent parent widget * @param Name name for this widget * @param F flags */ diff --git a/khexedit/lib/kcolumnsview.h b/khexedit/lib/kcolumnsview.h index ea5f520..3323df9 100644 --- a/khexedit/lib/kcolumnsview.h +++ b/khexedit/lib/kcolumnsview.h @@ -47,7 +47,7 @@ class KColumnsView : public TQScrollView friend class KColumn; public: - KColumnsView( /*bool R = false,*/ TQWidget *tqparent=0, const char *name=0, WFlags Flags=0 ); + KColumnsView( /*bool R = false,*/ TQWidget *parent=0, const char *name=0, WFlags Flags=0 ); virtual ~KColumnsView(); public: // drawing diff --git a/khexedit/listview.cc b/khexedit/listview.cc index b6af69b..3217cac 100644 --- a/khexedit/listview.cc +++ b/khexedit/listview.cc @@ -24,8 +24,8 @@ #include "listview.h" -CListView::CListView( TQWidget *tqparent, const char *name, int visibleItem ) - :KListView( tqparent, name ), mVisibleItem(TQMAX( 1, visibleItem )) +CListView::CListView( TQWidget *parent, const char *name, int visibleItem ) + :KListView( parent, name ), mVisibleItem(TQMAX( 1, visibleItem )) { setVisibleItem(visibleItem); } diff --git a/khexedit/listview.h b/khexedit/listview.h index f549539..975f3da 100644 --- a/khexedit/listview.h +++ b/khexedit/listview.h @@ -29,7 +29,7 @@ class CListView : public KListView TQ_OBJECT public: - CListView( TQWidget *tqparent=0, const char *name=0, int visibleItem=10 ); + CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 ); void setVisibleItem( int visibleItem, bool updateSize=true ); virtual TQSize tqsizeHint( void ) const; diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc index 4669d9d..a754e72 100644 --- a/khexedit/optiondialog.cc +++ b/khexedit/optiondialog.cc @@ -64,9 +64,9 @@ static void enableWidget( TQWidget *w, bool state ) -COptionDialog::COptionDialog( TQWidget *tqparent, char *name, bool modal ) +COptionDialog::COptionDialog( TQWidget *parent, char *name, bool modal ) :KDialogBase( IconList, i18n("Configure"), Help|Default|Apply|Ok|Cancel, - Ok, tqparent, name, modal, true ) + Ok, parent, name, modal, true ) { setHelp( "khexedit/khexedit.html", TQString() ); @@ -1050,8 +1050,8 @@ SDisplayCursor::EFocusMode COptionDialog::cursorFocusMode( void ) -CColorListBox::CColorListBox( TQWidget *tqparent, const char *name, WFlags f ) - :KListBox( tqparent, name, f ), mCurrentOnDragEnter(-1) +CColorListBox::CColorListBox( TQWidget *parent, const char *name, WFlags f ) + :KListBox( parent, name, f ), mCurrentOnDragEnter(-1) { connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); setAcceptDrops( true); diff --git a/khexedit/optiondialog.h b/khexedit/optiondialog.h index 7a8f678..0a54dab 100644 --- a/khexedit/optiondialog.h +++ b/khexedit/optiondialog.h @@ -46,7 +46,7 @@ class CColorListBox : public KListBox TQ_OBJECT public: - CColorListBox( TQWidget *tqparent=0, const char * name=0, WFlags f=0 ); + CColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 ); void setColor( uint index, const TQColor &color ); const TQColor color( uint index ); @@ -107,7 +107,7 @@ class COptionDialog : public KDialogBase page_max }; - COptionDialog( TQWidget *tqparent = 0, char *name = 0, bool modal = false ); + COptionDialog( TQWidget *parent = 0, char *name = 0, bool modal = false ); ~COptionDialog( void ); void setLayout( SDisplayLayout &tqlayout, SDisplayLine &line ); diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp index bfcb6be..cb2b549 100644 --- a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp +++ b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp @@ -26,8 +26,8 @@ #include "kbyteseditwidget.h" -KBytesEditWidget::KBytesEditWidget( TQWidget *tqparent, const char *name, const TQStringList & ) - : TQWidget( tqparent, name) +KBytesEditWidget::KBytesEditWidget( TQWidget *parent, const char *name, const TQStringList & ) + : TQWidget( parent, name) { TQHBoxLayout* Layout = new TQHBoxLayout( this ); BytesEdit = new KHE::KBytesEdit( this, "BytesEdit" ); diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.h b/khexedit/parts/kbytesedit/kbyteseditwidget.h index 9747ae6..1f44fbf 100644 --- a/khexedit/parts/kbytesedit/kbyteseditwidget.h +++ b/khexedit/parts/kbytesedit/kbyteseditwidget.h @@ -47,7 +47,7 @@ class KBytesEditWidget : public TQWidget, public KHE::BytesEditInterface, public: /** constructor API as demanded by KGenericFactory */ - KBytesEditWidget( TQWidget *tqparent, const char *name, const TQStringList & = TQStringList() ); + KBytesEditWidget( TQWidget *parent, const char *name, const TQStringList & = TQStringList() ); public: // bytesedit interface /** hands over to the editor a new byte array. diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h index 38aafd9..15f821c 100644 --- a/khexedit/parts/kpart/khepartfactory.h +++ b/khexedit/parts/kpart/khepartfactory.h @@ -35,7 +35,7 @@ class KHexEditPartFactory : public KParts::Factory public: virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/khexedit/printdialogpage.cc b/khexedit/printdialogpage.cc index ff65f10..cc01c8a 100644 --- a/khexedit/printdialogpage.cc +++ b/khexedit/printdialogpage.cc @@ -31,8 +31,8 @@ #include "printdialogpage.h" -LayoutDialogPage::LayoutDialogPage( TQWidget *tqparent, const char *name ) - : KPrintDialogPage( tqparent, name ) +LayoutDialogPage::LayoutDialogPage( TQWidget *parent, const char *name ) + : KPrintDialogPage( parent, name ) { mConfig = 0; setTitle( i18n( "Page Layout" ) ); diff --git a/khexedit/printdialogpage.h b/khexedit/printdialogpage.h index 6e2a1fb..1ad0ee4 100644 --- a/khexedit/printdialogpage.h +++ b/khexedit/printdialogpage.h @@ -36,7 +36,7 @@ class LayoutDialogPage : public KPrintDialogPage TQ_OBJECT public: - LayoutDialogPage( TQWidget *tqparent = 0, const char *name = 0 ); + LayoutDialogPage( TQWidget *parent = 0, const char *name = 0 ); ~LayoutDialogPage( void ); void getOptions( TQMap<TQString,TQString>& opts, bool incldef = false ); diff --git a/khexedit/searchbar.cc b/khexedit/searchbar.cc index 3de511d..3122980 100644 --- a/khexedit/searchbar.cc +++ b/khexedit/searchbar.cc @@ -51,8 +51,8 @@ static const char * close_xpm[] = { " ", " "}; -CSearchBar::CSearchBar( TQWidget *tqparent, const char *name, WFlags f ) - :TQFrame( tqparent, name, f ) +CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f ) + :TQFrame( parent, name, f ) { setFrameStyle( TQFrame::Panel | TQFrame::Raised ); setLineWidth( 1 ); diff --git a/khexedit/searchbar.h b/khexedit/searchbar.h index 00b25a8..25b9011 100644 --- a/khexedit/searchbar.h +++ b/khexedit/searchbar.h @@ -36,7 +36,7 @@ class CSearchBar : public TQFrame TQ_OBJECT public: - CSearchBar( TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); + CSearchBar( TQWidget *parent=0, const char *name=0, WFlags f=0 ); virtual bool eventFilter( TQObject *o, TQEvent *e ); public slots: diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cc index fda0c9d..ca1e918 100644 --- a/khexedit/statusbarprogress.cc +++ b/khexedit/statusbarprogress.cc @@ -28,16 +28,16 @@ #include <klocale.h> #include <tqstyle.h> -CStatusBarProgress::CStatusBarProgress( TQWidget *tqparent, const char *name ) - : TQFrame(tqparent, name), TQRangeControl(0, 100, 1, 10, 0), +CStatusBarProgress::CStatusBarProgress( TQWidget *parent, const char *name ) + : TQFrame(parent, name), TQRangeControl(0, 100, 1, 10, 0), mOrientation(Horizontal ) { initialize(); } CStatusBarProgress::CStatusBarProgress( Orientation orientation, - TQWidget *tqparent, const char *name ) - : TQFrame(tqparent, name), TQRangeControl(0, 100, 1, 10, 0), + TQWidget *parent, const char *name ) + : TQFrame(parent, name), TQRangeControl(0, 100, 1, 10, 0), mOrientation( orientation ) { initialize(); @@ -45,8 +45,8 @@ CStatusBarProgress::CStatusBarProgress( Orientation orientation, CStatusBarProgress::CStatusBarProgress( int minValue, int maxValue, int value, Orientation orientation, - TQWidget *tqparent, const char *name ) - : TQFrame(tqparent, name), TQRangeControl(minValue, maxValue, 1, 10, value), + TQWidget *parent, const char *name ) + : TQFrame(parent, name), TQRangeControl(minValue, maxValue, 1, 10, value), mOrientation(orientation) { initialize(); diff --git a/khexedit/statusbarprogress.h b/khexedit/statusbarprogress.h index 43dfd9d..f477055 100644 --- a/khexedit/statusbarprogress.h +++ b/khexedit/statusbarprogress.h @@ -47,18 +47,18 @@ class CStatusBarProgress : public TQFrame, public TQRangeControl /** * Construct a default progress bar. Orientation is horizontal. */ - CStatusBarProgress(TQWidget *tqparent=0, const char *name=0); + CStatusBarProgress(TQWidget *parent=0, const char *name=0); /** * Construct a KProgress bar with an orientation. */ - CStatusBarProgress(Orientation, TQWidget *tqparent=0, const char *name=0); + CStatusBarProgress(Orientation, TQWidget *parent=0, const char *name=0); /** * Construct a KProgress bar with minimum, maximum and initial value. */ CStatusBarProgress(int minValue, int maxValue, int value, Orientation, - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); /** * Destructor diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cc index d960da1..efd0933 100644 --- a/khexedit/stringdialog.cc +++ b/khexedit/stringdialog.cc @@ -34,9 +34,9 @@ #include <tqpushbutton.h> -CStringDialog::CStringDialog( TQWidget *tqparent, const char *name, bool modal ) +CStringDialog::CStringDialog( TQWidget *parent, const char *name, bool modal ) : KDialogBase( Plain, i18n("Extract Strings"), Help|User1|Cancel, User1, - tqparent, name, modal, true, i18n("&Update") ), + parent, name, modal, true, i18n("&Update") ), mMaxLength(0), mBusy(false), mDirty(false) { setHelp( "khexedit/khexedit.html", TQString() ); diff --git a/khexedit/stringdialog.h b/khexedit/stringdialog.h index 36b46f8..b854971 100644 --- a/khexedit/stringdialog.h +++ b/khexedit/stringdialog.h @@ -44,7 +44,7 @@ class CStringDialog : public KDialogBase TQ_OBJECT public: - CStringDialog( TQWidget *tqparent=0, const char *name = 0, bool modal=false ); + CStringDialog( TQWidget *parent=0, const char *name = 0, bool modal=false ); ~CStringDialog( void ); int updateList( CProgress &p ); diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc index db63594..7ac6a9a 100644 --- a/khexedit/toplevel.cc +++ b/khexedit/toplevel.cc @@ -288,7 +288,7 @@ actionCollection()); mDragLabel = new CDragLabel(this); mDragLabel->setPixmap( UserIcon( "hexdrag" ) ); - mDragLabel->setDragMask( UserIcon( "hextqmask" ) ); + mDragLabel->setDragMask( UserIcon( "hexmask" ) ); mDragLabel->setEnabled( false ); // Enabled once we open a document TQToolTip::add( mDragLabel, i18n("Drag document") ); (void) new KWidgetAction(mDragLabel, i18n("Drag Document"), 0, TQT_TQOBJECT(editor()), TQT_SLOT(options()), actionCollection(), "drag_document"); diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp index 28335ff..2feb47a 100644 --- a/kjots/KJotsMain.cpp +++ b/kjots/KJotsMain.cpp @@ -769,7 +769,7 @@ TQString KJotsMain::currentBookmarkTitle() while ( item ) { KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(item); - item = item->tqparent(); + item = item->parent(); if ( item ) { @@ -865,7 +865,7 @@ void KJotsMain::jumpToBookmark(const TQString& bookmark) { if ( ++pageCount == pageNo ) { - static_cast<TQListViewItem*>(entry)->tqparent()->setOpen(true); + static_cast<TQListViewItem*>(entry)->parent()->setOpen(true); subjectList->ensureItemVisible(entry); subjectList->setSelected(entry, true); jumpToEntry(entry); @@ -914,12 +914,12 @@ void KJotsMain::nextBook() */ void KJotsMain::prevBook() { - //Don't get caught by tqparent book. + //Don't get caught by parent book. TQListViewItem *startingPoint = subjectList->currentItem(); if ( !startingPoint ) return; //sanity check if ( dynamic_cast<KJotsPage*>(startingPoint) ) - startingPoint = startingPoint->tqparent(); + startingPoint = startingPoint->parent(); TQListViewItemIterator it ( startingPoint ); do { @@ -1043,7 +1043,7 @@ void KJotsMain::updateCaption() while ( item ) { KJotsEntryBase *entry = dynamic_cast<KJotsEntryBase*>(item); - item = item->tqparent(); + item = item->parent(); if ( item ) { @@ -1081,7 +1081,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst, //afterFirst doesn't work like we need it to. We want it to point to the //previous sibling, not just the entry directly above it. - if ( afterFirst && afterFirst->tqparent() != entry->parentBook() ) + if ( afterFirst && afterFirst->parent() != entry->parentBook() ) { TQListViewItemIterator it ( afterFirst ); afterFirst = 0; @@ -1096,7 +1096,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst, } //Found a previous sibling! - if ( it.current()->tqparent() == entry->parentBook() ) + if ( it.current()->parent() == entry->parentBook() ) { afterFirst = it.current(); break; @@ -1108,7 +1108,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst, KJotsEntryBase *entryAfter = dynamic_cast<KJotsEntryBase*>(afterFirst); - if ( entry->isPage() && !item->tqparent() ) + if ( entry->isPage() && !item->parent() ) { invalidMoveFlag=true; //Don't do anything while we're stuck here. subjectList->setItemsMovable(false); @@ -1149,7 +1149,7 @@ void KJotsMain::slotItemMoved(TQListViewItem *item, TQListViewItem* afterFirst, if ( entryAfter ) { - //Set the old tqparent book to dirty, since it just lost a page. + //Set the old parent book to dirty, since it just lost a page. if ( entryAfter->isBook() ) entryAfter->setDirty(true); else @@ -1173,7 +1173,7 @@ KJotsBook* KJotsMain::currentBook() { return dynamic_cast<KJotsBook*>(e); } - e = dynamic_cast<KJotsEntryBase*>(e->KListViewItem::tqparent()); + e = dynamic_cast<KJotsEntryBase*>(e->KListViewItem::parent()); } return 0; diff --git a/kjots/kjotsbookmarks.cpp b/kjots/kjotsbookmarks.cpp index 7259713..21ce6e8 100644 --- a/kjots/kjotsbookmarks.cpp +++ b/kjots/kjotsbookmarks.cpp @@ -23,9 +23,9 @@ #include "KJotsMain.h" #include "kjotsbookmarks.h" -KJotsBookmarks::KJotsBookmarks(KJotsMain* tqparent, const char* name) - : TQObject(tqparent, name), - m_kjots(tqparent) +KJotsBookmarks::KJotsBookmarks(KJotsMain* parent, const char* name) + : TQObject(parent, name), + m_kjots(parent) { } diff --git a/kjots/kjotsbookmarks.h b/kjots/kjotsbookmarks.h index 831b4e5..1351af4 100644 --- a/kjots/kjotsbookmarks.h +++ b/kjots/kjotsbookmarks.h @@ -33,7 +33,7 @@ class KJotsBookmarks : public TQObject, public KBookmarkOwner TQ_OBJECT public: - KJotsBookmarks(KJotsMain* tqparent = 0, const char* name = 0); + KJotsBookmarks(KJotsMain* parent = 0, const char* name = 0); ~KJotsBookmarks(); virtual void openBookmarkURL(const TQString& url); diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp index 6fdba79..eff6cba 100644 --- a/kjots/kjotsedit.cpp +++ b/kjots/kjotsedit.cpp @@ -36,8 +36,8 @@ //---------------------------------------------------------------------- // MYMULTIEDIT //---------------------------------------------------------------------- -KJotsEdit::KJotsEdit (TQWidget* tqparent, const char* name) - : KEdit(tqparent, name), +KJotsEdit::KJotsEdit (TQWidget* parent, const char* name) + : KEdit(parent, name), m_entry(0) { // no rich text until printing and other such issues are worked out diff --git a/kjots/kjotsedit.h b/kjots/kjotsedit.h index d54a627..39ddc3a 100644 --- a/kjots/kjotsedit.h +++ b/kjots/kjotsedit.h @@ -32,7 +32,7 @@ class KJotsEdit : public KEdit Q_OBJECT TQ_OBJECT public: - KJotsEdit (TQWidget* tqparent=0, const char* name=0); + KJotsEdit (TQWidget* parent=0, const char* name=0); ~KJotsEdit (); void print(TQString title = TQString()); diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp index e2d9d58..53613c3 100644 --- a/kjots/kjotsentry.cpp +++ b/kjots/kjotsentry.cpp @@ -69,20 +69,20 @@ TQString htmlFooter() // KJotsEntryBase // -KJotsEntryBase::KJotsEntryBase(KListView* tqparent, TQListViewItem* after=0) - :KListViewItem(tqparent,after) +KJotsEntryBase::KJotsEntryBase(KListView* parent, TQListViewItem* after=0) + :KListViewItem(parent,after) { m_id = 0; m_saveInProgress = m_dirty = false; m_parent = 0; } -KJotsEntryBase::KJotsEntryBase(KListViewItem* tqparent, TQListViewItem* after=0) - :KListViewItem(tqparent,after) +KJotsEntryBase::KJotsEntryBase(KListViewItem* parent, TQListViewItem* after=0) + :KListViewItem(parent,after) { m_id = 0; m_saveInProgress = m_dirty = false; - m_parent = dynamic_cast<KJotsBook*>(tqparent); + m_parent = dynamic_cast<KJotsBook*>(parent); } void KJotsEntryBase::setSubject(const TQString& subj) @@ -99,13 +99,13 @@ void KJotsEntryBase::setText(int column, const TQString& text) } /*! - \brief Sets a new tqparent. + \brief Sets a new parent. This is mostly just used during drag-and-drop reordering in the list view. - We need to keep track of the previous tqparent in case the move is invalid. + We need to keep track of the previous parent in case the move is invalid. */ void KJotsEntryBase::resetParent() { - m_parent = dynamic_cast<KJotsBook*>(TQListViewItem::tqparent()); + m_parent = dynamic_cast<KJotsBook*>(TQListViewItem::parent()); } /*! @@ -139,17 +139,17 @@ void KJotsEntryBase::setId(TQ_UINT64 id) This function should ONLY be called when saving the file, as it performs other functions than generating XML. */ -void KJotsEntryBase::generateXml( TQDomDocument &doc, TQDomElement &tqparent ) +void KJotsEntryBase::generateXml( TQDomDocument &doc, TQDomElement &parent ) { TQDomElement title = doc.createElement( "Title" ); title.appendChild( doc.createTextNode( subject() )); - tqparent.appendChild( title ); + parent.appendChild( title ); TQDomElement id = doc.createElement( "ID" ); TQString id_string; id_string.setNum(m_id); id.appendChild( doc.createTextNode(id_string) ); - tqparent.appendChild( id ); + parent.appendChild( id ); setDirty( false ); return; @@ -217,14 +217,14 @@ int KJotsEntryBase::printTitleBox(TQString title, KPrinter& printer, TQPainter& // KJotsBook // -KJotsBook::KJotsBook(KListView* tqparent, TQListViewItem* after) - : KJotsEntryBase(tqparent, after) +KJotsBook::KJotsBook(KListView* parent, TQListViewItem* after) + : KJotsEntryBase(parent, after) { init(); } -KJotsBook::KJotsBook(KListViewItem* tqparent, TQListViewItem* after) - : KJotsEntryBase(tqparent, after) +KJotsBook::KJotsBook(KListViewItem* parent, TQListViewItem* after) + : KJotsEntryBase(parent, after) { init(); } @@ -672,10 +672,10 @@ bool KJotsBook::isDirty() \brief Creates XML code and performs necessary tasks to save file. This function should ONLY be called when saving the file. */ -void KJotsBook::generateXml( TQDomDocument &doc, TQDomElement &tqparent ) +void KJotsBook::generateXml( TQDomDocument &doc, TQDomElement &parent ) { TQDomElement book = doc.createElement( "KJotsBook" ); - tqparent.appendChild( book ); + parent.appendChild( book ); KJotsEntryBase::generateXml(doc, book); //let the base class save important stuff @@ -690,9 +690,9 @@ void KJotsBook::generateXml( TQDomDocument &doc, TQDomElement &tqparent ) entry = dynamic_cast<KJotsEntryBase*>(entry->nextSibling()); } - if ( !m_fileName.isEmpty() && TQListViewItem::tqparent() ) + if ( !m_fileName.isEmpty() && TQListViewItem::parent() ) { - //Hmmmm... We were originally loaded from a file, but now we have a tqparent, so + //Hmmmm... We were originally loaded from a file, but now we have a parent, so //we must have been moved into another tree. Remove the old file now that we //have saved ourselves into the new tree. deleteBook(); @@ -843,8 +843,8 @@ TQString KJotsBook::generateText( void ) // KJotsPage // -KJotsPage::KJotsPage(KJotsBook* tqparent, TQListViewItem *after) - : KJotsEntryBase(tqparent,after), +KJotsPage::KJotsPage(KJotsBook* parent, TQListViewItem *after) + : KJotsEntryBase(parent,after), m_editor(0) { m_isBook = false; @@ -982,7 +982,7 @@ void KJotsPage::slotSaveResult(KIO::Job *) void KJotsPage::print(TQFont& defaultFont) { - KJotsEntryBase* book = dynamic_cast<KJotsEntryBase*>(KListViewItem::tqparent()); + KJotsEntryBase* book = dynamic_cast<KJotsEntryBase*>(KListViewItem::parent()); TQString docName = book->subject(); if (!subject().isNull()) @@ -1116,10 +1116,10 @@ bool KJotsPage::isDirty() /*! \brief Creates XML code and performs necessary tasks to save file. This function should ONLY be called when saving the file. -*/void KJotsPage::generateXml( TQDomDocument &doc, TQDomElement &tqparent ) +*/void KJotsPage::generateXml( TQDomDocument &doc, TQDomElement &parent ) { TQDomElement page = doc.createElement( "KJotsPage" ); - tqparent.appendChild( page ); + parent.appendChild( page ); KJotsEntryBase::generateXml(doc, page); //let the base class save important stuff @@ -1192,12 +1192,12 @@ TQString KJotsPage::generateHtml( KJotsEntryBase *top, bool diskMode ) if ( top != this ) { - KJotsBook *tqparent = parentBook(); - while ( tqparent ) + KJotsBook *parent = parentBook(); + while ( parent ) { - html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(tqparent->id()).tqarg(tqparent->subject()); - if ( tqparent == top ) break; - tqparent = tqparent->parentBook(); + html += TQString("<td><a href=\"#%1\">%2</a></td>").tqarg(parent->id()).tqarg(parent->subject()); + if ( parent == top ) break; + parent = parent->parentBook(); } } html += TQString("</tr></table>"); diff --git a/kjots/kjotsentry.h b/kjots/kjotsentry.h index b949886..9d7df78 100644 --- a/kjots/kjotsentry.h +++ b/kjots/kjotsentry.h @@ -145,7 +145,7 @@ class KJotsPage : public KJotsEntryBase Q_OBJECT TQ_OBJECT public: - KJotsPage(KJotsBook* tqparent, TQListViewItem* after = 0); + KJotsPage(KJotsBook* parent, TQListViewItem* after = 0); ~KJotsPage(); public: diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp index d0fd472..3fc436a 100644 --- a/klaptopdaemon/acpi.cpp +++ b/klaptopdaemon/acpi.cpp @@ -51,8 +51,8 @@ #include <tqtooltip.h> extern void wake_laptop_daemon(); -AcpiConfig::AcpiConfig (TQWidget * tqparent, const char *name) - : KCModule(tqparent, name) +AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) + : KCModule(parent, name) { KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages @@ -185,7 +185,7 @@ void AcpiConfig::setupHelper() KMessageBox::sorry(0, i18n("The ACPI helper cannot be enabled because kdesu cannot be found. Please make sure that it is installed correctly."), i18n("KLaptopDaemon")); } - laptop_portable::acpi_set_tqmask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle); + laptop_portable::acpi_set_mask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle); bool can_enable = laptop_portable::has_acpi(1); // is helper ready enableStandby->setEnabled(can_enable); enableSuspend->setEnabled(can_enable); @@ -206,7 +206,7 @@ void AcpiConfig::save() enablesoftwaresuspend = (enableSoftwareSuspendHibernate?enableSoftwareSuspendHibernate->isChecked():0); enableperformance = enablePerformance->isChecked(); enablethrottle = enableThrottle->isChecked(); - laptop_portable::acpi_set_tqmask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle); + laptop_portable::acpi_set_mask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle); config->setGroup("AcpiDefault"); diff --git a/klaptopdaemon/acpi.h b/klaptopdaemon/acpi.h index e98934b..ffa2840 100644 --- a/klaptopdaemon/acpi.h +++ b/klaptopdaemon/acpi.h @@ -42,7 +42,7 @@ class AcpiConfig : public KCModule Q_OBJECT TQ_OBJECT public: - AcpiConfig( TQWidget *tqparent=0, const char* name=0); + AcpiConfig( TQWidget *parent=0, const char* name=0); ~AcpiConfig( ); void save( void ); diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp index 228683f..e92dfc4 100644 --- a/klaptopdaemon/apm.cpp +++ b/klaptopdaemon/apm.cpp @@ -51,8 +51,8 @@ #include <tqtooltip.h> extern void wake_laptop_daemon(); -ApmConfig::ApmConfig (TQWidget * tqparent, const char *name) - : KCModule(tqparent, name) +ApmConfig::ApmConfig (TQWidget * parent, const char *name) + : KCModule(parent, name) { KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages @@ -173,7 +173,7 @@ void ApmConfig::setupHelper() KMessageBox::sorry(0, i18n("%1 cannot be enabled because kdesu cannot be found. Please make sure that it is installed correctly.").tqarg(TQString(apm_name)), i18n("KLaptopDaemon")); } - laptop_portable::apm_set_tqmask(enablestandby, enablesuspend); + laptop_portable::apm_set_mask(enablestandby, enablesuspend); bool can_enable = laptop_portable::has_apm(1); // is helper ready enableStandby->setEnabled(can_enable); enableSuspend->setEnabled(can_enable); @@ -207,7 +207,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend KMessageBox::sorry(0, i18n("The Software Suspend helper cannot be enabled because kdesu cannot be found. Please make sure that it is installed correctly."), i18n("KLaptopDaemon")); } - laptop_portable::software_suspend_set_tqmask(enablesoftwaresuspend); + laptop_portable::software_suspend_set_mask(enablesoftwaresuspend); bool can_enable = laptop_portable::has_software_suspend(2); // is helper ready enableSoftwareSuspendHibernate->setEnabled(can_enable); wake_laptop_daemon(); @@ -218,9 +218,9 @@ void ApmConfig::save() { enablestandby = enableStandby->isChecked(); enablesuspend = enableSuspend->isChecked(); - laptop_portable::apm_set_tqmask(enablestandby, enablesuspend); + laptop_portable::apm_set_mask(enablestandby, enablesuspend); enablesoftwaresuspend = (enableSoftwareSuspendHibernate ? enableSoftwareSuspendHibernate->isChecked():0); - laptop_portable::software_suspend_set_tqmask(enablesoftwaresuspend); + laptop_portable::software_suspend_set_mask(enablesoftwaresuspend); config->setGroup("ApmDefault"); diff --git a/klaptopdaemon/apm.h b/klaptopdaemon/apm.h index f99e726..e57d77a 100644 --- a/klaptopdaemon/apm.h +++ b/klaptopdaemon/apm.h @@ -42,7 +42,7 @@ class ApmConfig : public KCModule Q_OBJECT TQ_OBJECT public: - ApmConfig( TQWidget *tqparent=0, const char* name=0); + ApmConfig( TQWidget *parent=0, const char* name=0); ~ApmConfig( ); void save( void ); diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp index a80ecbf..bee367c 100644 --- a/klaptopdaemon/battery.cpp +++ b/klaptopdaemon/battery.cpp @@ -51,8 +51,8 @@ extern void wake_laptop_daemon(); -BatteryConfig::BatteryConfig (TQWidget * tqparent, const char *name) - : KCModule(tqparent, name), +BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) + : KCModule(parent, name), editPoll(0), iconloader(0), buttonNoBattery(0), diff --git a/klaptopdaemon/battery.h b/klaptopdaemon/battery.h index 8500803..e76fba6 100644 --- a/klaptopdaemon/battery.h +++ b/klaptopdaemon/battery.h @@ -47,7 +47,7 @@ class BatteryConfig : public KCModule Q_OBJECT TQ_OBJECT public: - BatteryConfig( TQWidget *tqparent=0, const char* name=0); + BatteryConfig( TQWidget *parent=0, const char* name=0); ~BatteryConfig( ); void save( void ); diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp index 4c4c65d..b00fbc4 100644 --- a/klaptopdaemon/buttons.cpp +++ b/klaptopdaemon/buttons.cpp @@ -44,8 +44,8 @@ #include <tqtooltip.h> extern void wake_laptop_daemon(); -ButtonsConfig::ButtonsConfig (TQWidget * tqparent, const char *name) - : KCModule(tqparent, name), +ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) + : KCModule(parent, name), lidBox(0), lidStandby(0), lidSuspend(0), diff --git a/klaptopdaemon/buttons.h b/klaptopdaemon/buttons.h index 9263f5f..76910c7 100644 --- a/klaptopdaemon/buttons.h +++ b/klaptopdaemon/buttons.h @@ -42,7 +42,7 @@ class ButtonsConfig : public KCModule Q_OBJECT TQ_OBJECT public: - ButtonsConfig( TQWidget *tqparent=0, const char* name=0); + ButtonsConfig( TQWidget *parent=0, const char* name=0); ~ButtonsConfig(); void save( void ); void load(); diff --git a/klaptopdaemon/daemon_state.cpp b/klaptopdaemon/daemon_state.cpp index 37db2ee..49d4ade 100644 --- a/klaptopdaemon/daemon_state.cpp +++ b/klaptopdaemon/daemon_state.cpp @@ -83,16 +83,16 @@ void daemon_state::load() bool enablehibernate = config->readBoolEntry("EnableHibernate", false); bool enableperformance = config->readBoolEntry("EnablePerformance", false); bool enablethrottle = config->readBoolEntry("EnableThrottle", false); - laptop_portable::acpi_set_tqmask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle); + laptop_portable::acpi_set_mask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle); config->setGroup("ApmDefault"); enablestandby = config->readBoolEntry("EnableStandby", false); enablesuspend = config->readBoolEntry("EnableSuspend", false); - laptop_portable::apm_set_tqmask(enablestandby, enablesuspend); + laptop_portable::apm_set_mask(enablestandby, enablesuspend); config->setGroup("SoftwareSuspendDefault"); enablehibernate = config->readBoolEntry("EnableHibernate", false); - laptop_portable::software_suspend_set_tqmask(enablehibernate); + laptop_portable::software_suspend_set_mask(enablehibernate); exists = laptop_portable::has_power_management(); has_brightness = laptop_portable::has_brightness(); diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index 1388b0a..c5c0a58 100644 --- a/klaptopdaemon/daemondock.cpp +++ b/klaptopdaemon/daemondock.cpp @@ -48,13 +48,13 @@ #include <kiconeffect.h> extern void wake_laptop_daemon(); -laptop_dock::laptop_dock( laptop_daemon* tqparent ) +laptop_dock::laptop_dock( laptop_daemon* parent ) : KSystemTray() { setCaption(i18n("KLaptop Daemon")); KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages _pcmcia = NULL; - pdaemon = tqparent; + pdaemon = parent; current_code = -1; brightness_widget = 0; instance = new KInstance("klaptopdaemon"); @@ -568,10 +568,10 @@ void laptop_dock::displayPixmap() // at this point, we have the file to display. so display it TQImage image = pm.convertToImage(); - const TQBitmap *bmtqmask = pm.tqmask(); - TQImage tqmask; - if (bmtqmask) - tqmask = bmtqmask->convertToImage(); + const TQBitmap *bmmask = pm.mask(); + TQImage mask; + if (bmmask) + mask = bmmask->convertToImage(); int w = image.width(); int h = image.height(); @@ -580,7 +580,7 @@ void laptop_dock::displayPixmap() int x, y; for (x = 0; x < w; x++) for (y = 0; y < h; y++) - if (!bmtqmask || tqmask.pixelIndex(x, y) != 0){ + if (!bmmask || mask.pixelIndex(x, y) != 0){ rgb = image.pixel(x, y); if (tqRed(rgb) == 0xff && tqGreen(rgb) == 0xff && @@ -609,7 +609,7 @@ void laptop_dock::displayPixmap() for (y = h-1; y >= 0; y--) for (x = 0; x < w; x++) - if (!bmtqmask || tqmask.pixelIndex(x, y) != 0){ + if (!bmmask || mask.pixelIndex(x, y) != 0){ rgb = image.pixel(x, y); if (tqRed(rgb) == 0xff && tqGreen(rgb) == 0xff && @@ -743,8 +743,8 @@ quit: { TQPixmap q; q.convertFromImage(image); - if (bmtqmask) - q.setMask(*bmtqmask); + if (bmmask) + q.setMask(*bmmask); setPixmap(q); } adjustSize(); diff --git a/klaptopdaemon/daemondock.h b/klaptopdaemon/daemondock.h index f16acaf..6fab64d 100644 --- a/klaptopdaemon/daemondock.h +++ b/klaptopdaemon/daemondock.h @@ -44,7 +44,7 @@ class laptop_dock : public KSystemTray { TQ_OBJECT public: - laptop_dock(laptop_daemon* tqparent); + laptop_dock(laptop_daemon* parent); ~laptop_dock(); void displayPixmap(); diff --git a/klaptopdaemon/kpcmciainfo.cpp b/klaptopdaemon/kpcmciainfo.cpp index 2b4c315..3a9b67a 100644 --- a/klaptopdaemon/kpcmciainfo.cpp +++ b/klaptopdaemon/kpcmciainfo.cpp @@ -36,8 +36,8 @@ #include "kpcmciainfo.h" -KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *tqparent, const char *name) - : KDialog(tqparent, name, false), _pcmcia(pcmcia) { +KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name) + : KDialog(parent, name, false), _pcmcia(pcmcia) { setMinimumSize(300,400); @@ -149,8 +149,8 @@ void KPCMCIAInfo::prepareCards() { /////////////////////////////////////////////////////////////////////////// -KPCMCIAInfoPage::KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *tqparent, const char *name) - : TQFrame(tqparent, name), _card(card) { +KPCMCIAInfoPage::KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent, const char *name) + : TQFrame(parent, name), _card(card) { _mainGrid = new TQGridLayout(this, 10, 10); if (!_card) { // display an error diff --git a/klaptopdaemon/kpcmciainfo.h b/klaptopdaemon/kpcmciainfo.h index f8700a2..20bc16e 100644 --- a/klaptopdaemon/kpcmciainfo.h +++ b/klaptopdaemon/kpcmciainfo.h @@ -42,7 +42,7 @@ Q_OBJECT TQ_OBJECT public: - KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *tqparent = NULL, const char *name = 0); + KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent = NULL, const char *name = 0); virtual ~KPCMCIAInfo(); void showTab(int num); @@ -80,7 +80,7 @@ class KPCMCIAInfoPage : public TQFrame { Q_OBJECT TQ_OBJECT public: - KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *tqparent = NULL, const char *name = 0); + KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent = NULL, const char *name = 0); virtual ~KPCMCIAInfoPage(); public slots: diff --git a/klaptopdaemon/krichtextlabel.cpp b/klaptopdaemon/krichtextlabel.cpp index a604b0d..3d9dfcd 100644 --- a/klaptopdaemon/krichtextlabel.cpp +++ b/klaptopdaemon/krichtextlabel.cpp @@ -38,15 +38,15 @@ static TQString qrichtextify( const TQString& text ) return lines.join(TQString()); } -KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ) { +KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) + : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); tqsetAlignment( TQt::WordBreak ); setText(text); } -KRichTextLabel::KRichTextLabel( TQWidget *tqparent, const char *name ) - : TQLabel ( tqparent, name ) { +KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) + : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); tqsetAlignment( TQt::WordBreak ); } diff --git a/klaptopdaemon/krichtextlabel.h b/klaptopdaemon/krichtextlabel.h index 42e7a75..e9b59d4 100644 --- a/klaptopdaemon/krichtextlabel.h +++ b/klaptopdaemon/krichtextlabel.h @@ -40,8 +40,8 @@ public: /** * Default constructor. */ - KRichTextLabel( TQWidget *tqparent, const char *name = 0 ); - KRichTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 ); + KRichTextLabel( TQWidget *parent, const char *name = 0 ); + KRichTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); diff --git a/klaptopdaemon/linux/cistpl.h b/klaptopdaemon/linux/cistpl.h index 6fab93a..ee27463 100644 --- a/klaptopdaemon/linux/cistpl.h +++ b/klaptopdaemon/linux/cistpl.h @@ -353,7 +353,7 @@ typedef struct cistpl_bar_t { typedef struct cistpl_config_t { u_char last_idx; u_int base; - u_int rtqmask[4]; + u_int rmask[4]; u_char subtuples; } cistpl_config_t; diff --git a/klaptopdaemon/linux/ss.h b/klaptopdaemon/linux/ss.h index b9dbb39..f7030d0 100644 --- a/klaptopdaemon/linux/ss.h +++ b/klaptopdaemon/linux/ss.h @@ -44,7 +44,7 @@ typedef struct ss_callback_t { /* for InquireSocket */ typedef struct socket_cap_t { u_int features; - u_int irq_tqmask; + u_int irq_mask; u_int map_size; u_char pci_irq; u_char cardbus; @@ -56,7 +56,7 @@ typedef struct socket_cap_t { /* for GetSocket, SetSocket */ typedef struct socket_state_t { u_int flags; - u_int csc_tqmask; + u_int csc_mask; u_char Vcc, Vpp; u_char io_irq; } socket_state_t; diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp index c39f153..535e391 100644 --- a/klaptopdaemon/main.cpp +++ b/klaptopdaemon/main.cpp @@ -48,46 +48,46 @@ extern void wake_laptop_daemon(); extern "C" { - KDE_EXPORT KCModule *create_pcmcia(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_pcmcia(TQWidget *parent, const char *) { - return new PcmciaConfig(tqparent, "kcmlaptop"); + return new PcmciaConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_bwarning(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_bwarning(TQWidget *parent, const char *) { - return new WarningConfig(0, tqparent, "kcmlaptop"); + return new WarningConfig(0, parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_cwarning(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_cwarning(TQWidget *parent, const char *) { - return new WarningConfig(1, tqparent, "kcmlaptop"); + return new WarningConfig(1, parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_battery(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_battery(TQWidget *parent, const char *) { - return new BatteryConfig(tqparent, "kcmlaptop"); + return new BatteryConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_power(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_power(TQWidget *parent, const char *) { - return new PowerConfig(tqparent, "kcmlaptop"); + return new PowerConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_acpi(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_acpi(TQWidget *parent, const char *) { - return new AcpiConfig(tqparent, "kcmlaptop"); + return new AcpiConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_apm(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_apm(TQWidget *parent, const char *) { - return new ApmConfig(tqparent, "kcmlaptop"); + return new ApmConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_Profile(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_Profile(TQWidget *parent, const char *) { - return new ProfileConfig(tqparent, "kcmlaptop"); + return new ProfileConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_sony(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_sony(TQWidget *parent, const char *) { - return new SonyConfig(tqparent, "kcmlaptop"); + return new SonyConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_buttons(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_buttons(TQWidget *parent, const char *) { - return new ButtonsConfig(tqparent, "kcmlaptop"); + return new ButtonsConfig(parent, "kcmlaptop"); } KDE_EXPORT void init_battery() @@ -111,9 +111,9 @@ extern "C" wake_laptop_daemon(); } - KDE_EXPORT KCModule *create_laptop(TQWidget *tqparent, const char *) + KDE_EXPORT KCModule *create_laptop(TQWidget *parent, const char *) { - return new LaptopModule(tqparent, "kcmlaptop"); + return new LaptopModule(parent, "kcmlaptop"); } KDE_EXPORT void init_laptop() @@ -124,8 +124,8 @@ extern "C" -LaptopModule::LaptopModule(TQWidget *tqparent, const char *) - : KCModule(tqparent, "kcmlaptop") +LaptopModule::LaptopModule(TQWidget *parent, const char *) + : KCModule(parent, "kcmlaptop") { { // export ACPI options KConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/); @@ -136,34 +136,34 @@ LaptopModule::LaptopModule(TQWidget *tqparent, const char *) bool enablehibernate = config.readBoolEntry("EnableHibernate", false); bool enableperformance = config.readBoolEntry("EnablePerformance", false); bool enablethrottle = config.readBoolEntry("EnableThrottle", false); - laptop_portable::acpi_set_tqmask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle); + laptop_portable::acpi_set_mask(enablestandby, enablesuspend, enablehibernate, enableperformance, enablethrottle); config.setGroup("ApmDefault"); enablestandby = config.readBoolEntry("EnableStandby", false); enablesuspend = config.readBoolEntry("EnableSuspend", false); - laptop_portable::apm_set_tqmask(enablestandby, enablesuspend); + laptop_portable::apm_set_mask(enablestandby, enablesuspend); config.setGroup("SoftwareSuspendDefault"); enablehibernate = config.readBoolEntry("EnableHibernate", false); - laptop_portable::software_suspend_set_tqmask(enablehibernate); + laptop_portable::software_suspend_set_mask(enablehibernate); } TQVBoxLayout *tqlayout = new TQVBoxLayout(this); tab = new TQTabWidget(this); tqlayout->addWidget(tab); - battery = new BatteryConfig(tqparent, "kcmlaptop"); + battery = new BatteryConfig(parent, "kcmlaptop"); tab->addTab(battery, i18n("&Battery")); connect(battery, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); - power = new PowerConfig(tqparent, "kcmlaptop"); + power = new PowerConfig(parent, "kcmlaptop"); tab->addTab(power, i18n("&Power Control")); connect(power, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); - warning = new WarningConfig(0, tqparent, "kcmlaptop"); + warning = new WarningConfig(0, parent, "kcmlaptop"); tab->addTab(warning, i18n("Low Battery &Warning")); connect(warning, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); - critical = new WarningConfig(1, tqparent, "kcmlaptop"); + critical = new WarningConfig(1, parent, "kcmlaptop"); tab->addTab(critical, i18n("Low Battery &Critical")); connect(critical, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); @@ -175,28 +175,28 @@ LaptopModule::LaptopModule(TQWidget *tqparent, const char *) int current_throttle; bool has_throttling = laptop_portable::get_system_throttling(0, current_throttle, throttle_list, active_list); if (laptop_portable::has_brightness() || has_profile || has_throttling) { - profile = new ProfileConfig(tqparent, "kcmlaptop"); + profile = new ProfileConfig(parent, "kcmlaptop"); tab->addTab(profile, i18n("Default Power Profiles")); connect(profile, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); } else { profile = 0; } if (laptop_portable::has_button(laptop_portable::LidButton) || laptop_portable::has_button(laptop_portable::PowerButton)) { - buttons = new ButtonsConfig(tqparent, "kcmlaptop"); + buttons = new ButtonsConfig(parent, "kcmlaptop"); tab->addTab(buttons, i18n("Button Actions")); connect(buttons, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); } else { buttons = 0; } if (laptop_portable::has_acpi()) { - acpi = new AcpiConfig(tqparent, "kcmlaptop"); + acpi = new AcpiConfig(parent, "kcmlaptop"); tab->addTab(acpi, i18n("&ACPI Config")); connect(acpi, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); } else { acpi = 0; } if (laptop_portable::has_apm()) { - apm = new ApmConfig(tqparent, "kcmlaptop"); + apm = new ApmConfig(parent, "kcmlaptop"); tab->addTab(apm, i18n("&APM Config")); connect(apm, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); } else { @@ -213,7 +213,7 @@ LaptopModule::LaptopModule(TQWidget *tqparent, const char *) } } if (do_sony) { - sony = new SonyConfig(tqparent, "kcmlaptop"); + sony = new SonyConfig(parent, "kcmlaptop"); tab->addTab(sony, i18n("&Sony Laptop Config")); connect(sony, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); } else { diff --git a/klaptopdaemon/main.h b/klaptopdaemon/main.h index ddefe22..973c2c8 100644 --- a/klaptopdaemon/main.h +++ b/klaptopdaemon/main.h @@ -48,7 +48,7 @@ class LaptopModule : public KCModule public: - LaptopModule(TQWidget *tqparent, const char *name); + LaptopModule(TQWidget *parent, const char *name); void load(); void save(); diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp index 4bde3b3..a2f4ba8 100644 --- a/klaptopdaemon/pcmcia.cpp +++ b/klaptopdaemon/pcmcia.cpp @@ -37,8 +37,8 @@ #include "portable.h" #include "version.h" -PcmciaConfig::PcmciaConfig (TQWidget * tqparent, const char *name) - : KCModule(tqparent, name) +PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name) + : KCModule(parent, name) { KAboutData *about = new KAboutData(I18N_NOOP("kcmlaptop"), diff --git a/klaptopdaemon/pcmcia.h b/klaptopdaemon/pcmcia.h index 18eec79..60fc24f 100644 --- a/klaptopdaemon/pcmcia.h +++ b/klaptopdaemon/pcmcia.h @@ -43,7 +43,7 @@ class PcmciaConfig : public KCModule Q_OBJECT TQ_OBJECT public: - PcmciaConfig( TQWidget *tqparent=0, const char* name=0); + PcmciaConfig( TQWidget *parent=0, const char* name=0); void save( void ); void load(); diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp index 29c4d22..346a311 100644 --- a/klaptopdaemon/portable.cpp +++ b/klaptopdaemon/portable.cpp @@ -602,7 +602,7 @@ laptop_portable::has_software_suspend(int type) } void -laptop_portable::software_suspend_set_tqmask(bool hibernate) +laptop_portable::software_suspend_set_mask(bool hibernate) { software_suspend_is_preferred = hibernate; } @@ -677,17 +677,17 @@ has_acpi_power() return(val); } -static unsigned long acpi_sleep_enabled = 0x00; // acpi sleep functions enabled tqmask +static unsigned long acpi_sleep_enabled = 0x00; // acpi sleep functions enabled mask static bool has_acpi_sleep(int state) { static int known=0; - static unsigned long tqmask=0; + static unsigned long mask=0; if (known != last_seed) { known = last_seed; - tqmask = 0; + mask = 0; TQFile p("/sys/power/state"); TQFile f("/proc/acpi/sleep"); @@ -701,11 +701,11 @@ has_acpi_sleep(int state) TQString s = *i; if (s.compare("standby")==0) - tqmask |= (1<<1); + mask |= (1<<1); else if (s.compare("mem")==0) - tqmask |= (1<<3); + mask |= (1<<3); else if (s.compare("disk")==0) - tqmask |= (1<<4); + mask |= (1<<4); } p.close(); } @@ -719,19 +719,19 @@ has_acpi_sleep(int state) if (s[0] == 'S') { int c = s[1].digitValue(); if (c >= 0 && c <= 9) - tqmask |= 1<<c; + mask |= 1<<c; } } f.close(); } } - return((tqmask&acpi_sleep_enabled&(1<<state)) != 0); + return((mask&acpi_sleep_enabled&(1<<state)) != 0); } static bool acpi_performance_enabled = 0; static bool acpi_throttle_enabled = 0; void -laptop_portable::acpi_set_tqmask(bool standby, bool suspend, bool hibernate, bool perf, bool throttle) +laptop_portable::acpi_set_mask(bool standby, bool suspend, bool hibernate, bool perf, bool throttle) { acpi_sleep_enabled = (standby ? (1<<1)|(1<<2) : 0) | @@ -755,7 +755,7 @@ invoke_acpi_helper(const char *param, const char *param2, const char *param3) proc.start(KProcess::Block); // helper runs fast and we want to see the result } -static unsigned long apm_sleep_enabled = 0x0c; // apm sleep functions enabled tqmask +static unsigned long apm_sleep_enabled = 0x0c; // apm sleep functions enabled mask static bool has_apm_sleep(int state) { @@ -763,7 +763,7 @@ has_apm_sleep(int state) } void -laptop_portable::apm_set_tqmask(bool standby, bool suspend) +laptop_portable::apm_set_mask(bool standby, bool suspend) { apm_sleep_enabled = (standby ? 1<<2 : 0) | @@ -939,14 +939,14 @@ int laptop_portable::has_hibernation() // to get any software they lack // -KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparent) +KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *parent) { if (access("/proc/acpi", F_OK) == 0) { // probably has default kernel ACPI installed - KActiveLabel* explain = new KActiveLabel(i18n("Your computer seems to have a partial ACPI installation. ACPI was probably enabled, but some of the sub-options were not - you need to enable at least 'AC Adaptor' and 'Control Method Battery' and then rebuild your kernel."), tqparent); + KActiveLabel* explain = new KActiveLabel(i18n("Your computer seems to have a partial ACPI installation. ACPI was probably enabled, but some of the sub-options were not - you need to enable at least 'AC Adaptor' and 'Control Method Battery' and then rebuild your kernel."), parent); return(explain); } - KActiveLabel* explain = new KActiveLabel(i18n("Your computer doesn't have the Linux APM (Advanced Power Management) or ACPI software installed, or doesn't have the APM kernel drivers installed - check out the <a href=\"http://www.linuxdoc.org/HOWTO/Laptop-HOWTO.html\">Linux Laptop-HOWTO</a> document for information on how to install APM."), tqparent); + KActiveLabel* explain = new KActiveLabel(i18n("Your computer doesn't have the Linux APM (Advanced Power Management) or ACPI software installed, or doesn't have the APM kernel drivers installed - check out the <a href=\"http://www.linuxdoc.org/HOWTO/Laptop-HOWTO.html\">Linux Laptop-HOWTO</a> document for information on how to install APM."), parent); return(explain); } @@ -954,23 +954,23 @@ KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparen // // explain to the user what they need to do to get suspend/resume to work from user mode // -TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent) +TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *parent) { if (::has_apm()) { // TODO: remove linefeed from string, can't do it right now coz we have a string freeze TQLabel* note = new KRichTextLabel(i18n("\nIf you make /usr/bin/apm setuid then you will also " "be able to choose 'suspend' and 'standby' in the above " "dialog - check out the help button below to find out " - "how to do this").replace("\n", TQString()), tqparent); + "how to do this").replace("\n", TQString()), parent); return(note); } if (::has_acpi()) { // TODO: remove linefeed from string, can't do it right now coz we have a string freeze - TQLabel* note = new KRichTextLabel(i18n("\nYou may need to enable ACPI suspend/resume in the ACPI panel").replace("\n", TQString()), tqparent); + TQLabel* note = new KRichTextLabel(i18n("\nYou may need to enable ACPI suspend/resume in the ACPI panel").replace("\n", TQString()), parent); return(note); } // TODO: remove linefeed from string, can't do it right now coz we have a string freeze - TQLabel* note = new KRichTextLabel(i18n("\nYour system does not support suspend/standby").replace("\n", TQString()), tqparent); + TQLabel* note = new KRichTextLabel(i18n("\nYour system does not support suspend/standby").replace("\n", TQString()), parent); return(note); } @@ -1040,20 +1040,20 @@ void get_pcmcia_info() // pcmcia support - this will be replaced by better - pcmcia support being worked on by // others // -TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *tqparent) +TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *parent) { if (x == 0) get_pcmcia_info(); if (!present) { if (x == 1) - return(new TQLabel(i18n("No PCMCIA controller detected"), tqparent)); - return(new TQLabel(i18n(""), tqparent)); + return(new TQLabel(i18n("No PCMCIA controller detected"), parent)); + return(new TQLabel(i18n(""), parent)); } else { switch (x) { - case 0: return(new TQLabel(i18n("Card 0:"), tqparent)); - case 1: return(new TQLabel(tmp0, tqparent)); - case 2: return(new TQLabel(i18n("Card 1:"), tqparent)); - default:return(new TQLabel(tmp1, tqparent)); + case 0: return(new TQLabel(i18n("Card 0:"), parent)); + case 1: return(new TQLabel(tmp0, parent)); + case 2: return(new TQLabel(i18n("Card 1:"), parent)); + default:return(new TQLabel(tmp1, parent)); } } } @@ -2139,7 +2139,7 @@ int laptop_portable::has_hibernation() // explain to the user what they need to do if has_power_management() returned 0 // to get any software they lack // -KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparent) +KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *parent) { int fd; KActiveLabel *explain; @@ -2148,22 +2148,22 @@ KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparen if (fd == -1) { switch (errno) { case ENOENT: - explain = new KActiveLabel(i18n("There is no /dev/apm file on this system. Please review the FreeBSD handbook on how to create a device node for the APM device driver (man 4 apm)."), tqparent); + explain = new KActiveLabel(i18n("There is no /dev/apm file on this system. Please review the FreeBSD handbook on how to create a device node for the APM device driver (man 4 apm)."), parent); break; case EACCES: - explain = new KActiveLabel(i18n("Your system has the proper device node for APM support, however you cannot access it. If you are logged in as root right now, you have a problem, otherwise contact your local sysadmin and ask for read/write access to /dev/apm."), tqparent); + explain = new KActiveLabel(i18n("Your system has the proper device node for APM support, however you cannot access it. If you are logged in as root right now, you have a problem, otherwise contact your local sysadmin and ask for read/write access to /dev/apm."), parent); break; case ENXIO: - explain = new KActiveLabel(i18n("Your kernel lacks support for Advanced Power Management."), tqparent); + explain = new KActiveLabel(i18n("Your kernel lacks support for Advanced Power Management."), parent); break; break; default: - explain = new KActiveLabel(i18n("There was a generic error while opening /dev/apm."), tqparent); + explain = new KActiveLabel(i18n("There was a generic error while opening /dev/apm."), parent); break; } } else { close(fd); - explain = new KActiveLabel(i18n("APM has most likely been disabled."), tqparent); + explain = new KActiveLabel(i18n("APM has most likely been disabled."), parent); } return(explain); @@ -2172,9 +2172,9 @@ KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparen // // explain to the user what they need to do to get suspend/resume to work from user mode // -TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent) +TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *parent) { - TQLabel* note = new TQLabel(" ", tqparent); + TQLabel* note = new TQLabel(" ", parent); return(note); } @@ -2183,11 +2183,11 @@ TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent) // pcmcia support - this will be replaced by better - pcmcia support being worked on by // others // -TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *tqparent) +TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *parent) { if (x == 0) - return(new TQLabel(i18n("No PCMCIA controller detected"), tqparent)); - return(new TQLabel(i18n(""), tqparent)); + return(new TQLabel(i18n("No PCMCIA controller detected"), parent)); + return(new TQLabel(i18n(""), parent)); } // // puts us into standby mode @@ -2239,7 +2239,7 @@ void laptop_portable::invoke_hibernation() //ACPI specific - chances are you don't need to implement this one // void -laptop_portable::acpi_set_tqmask(bool, bool, bool, bool, bool ) +laptop_portable::acpi_set_mask(bool, bool, bool, bool, bool ) { // INSERT HERE } @@ -2258,7 +2258,7 @@ int laptop_portable::has_apm(int type) } void -laptop_portable::apm_set_tqmask(bool , bool ) +laptop_portable::apm_set_mask(bool , bool ) { } @@ -2267,7 +2267,7 @@ laptop_portable::apm_set_tqmask(bool , bool ) // adds extra widgets to the battery panel // void -laptop_portable::extra_config(TQWidget * /*tqparent*/, KConfig * /*config*/, TQVBoxLayout * /*tqlayout*/) +laptop_portable::extra_config(TQWidget * /*parent*/, KConfig * /*config*/, TQVBoxLayout * /*tqlayout*/) { // INSERT HERE } @@ -2423,7 +2423,7 @@ laptop_portable::has_software_suspend(int /*type*/) } void -laptop_portable::software_suspend_set_tqmask(bool /*hibernate*/) +laptop_portable::software_suspend_set_mask(bool /*hibernate*/) { // software_suspend_is_preferred = hibernate; } @@ -2544,7 +2544,7 @@ int laptop_portable::has_hibernation() // explain to the user what they need to do if has_power_management() returned 0 // to get any software they lack // -KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparent) +KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *parent) { int fd; KActiveLabel *explain; @@ -2553,22 +2553,22 @@ KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparen if (fd == -1) { switch (errno) { case ENOENT: - explain = new KActiveLabel(i18n("There is no /dev/apm file on this system. Please review the NetBSD documentation on how to create a device node for the APM device driver (man 4 apm)."), tqparent); + explain = new KActiveLabel(i18n("There is no /dev/apm file on this system. Please review the NetBSD documentation on how to create a device node for the APM device driver (man 4 apm)."), parent); break; case EACCES: - explain = new KActiveLabel(i18n("Your system has the proper device node for APM support, however you cannot access it. If you have APM compiled into the kernel this should not happen."), tqparent); + explain = new KActiveLabel(i18n("Your system has the proper device node for APM support, however you cannot access it. If you have APM compiled into the kernel this should not happen."), parent); break; case ENXIO: - explain = new KActiveLabel(i18n("Your kernel lacks support for Advanced Power Management."), tqparent); + explain = new KActiveLabel(i18n("Your kernel lacks support for Advanced Power Management."), parent); break; break; default: - explain = new KActiveLabel(i18n("There was a generic error while opening /dev/apm."), tqparent); + explain = new KActiveLabel(i18n("There was a generic error while opening /dev/apm."), parent); break; } } else { close(fd); - explain = new KActiveLabel(i18n("APM has most likely been disabled."), tqparent); + explain = new KActiveLabel(i18n("APM has most likely been disabled."), parent); } return(explain); @@ -2577,10 +2577,10 @@ KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparen // // explain to the user what they need to do to get suspend/resume to work from user mode // -TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent) +TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *parent) { // INSERT HERE - TQLabel* note = new TQLabel(" ", tqparent); + TQLabel* note = new TQLabel(" ", parent); return(note); } @@ -2588,12 +2588,12 @@ TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent) // pcmcia support - this will be replaced by better - pcmcia support being worked on by // others // -TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *tqparent) +TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *parent) { // INSERT HERE if (x == 0) - return(new TQLabel(i18n("No PCMCIA controller detected"), tqparent)); - return(new TQLabel(i18n(""), tqparent)); + return(new TQLabel(i18n("No PCMCIA controller detected"), parent)); + return(new TQLabel(i18n(""), parent)); } // @@ -2636,7 +2636,7 @@ void laptop_portable::invoke_hibernation() //ACPI specific - chances are you don't need to implement this one // void -laptop_portable::acpi_set_tqmask(bool, bool, bool, bool, bool ) +laptop_portable::acpi_set_mask(bool, bool, bool, bool, bool ) { // INSERT HERE } @@ -2655,7 +2655,7 @@ int laptop_portable::has_apm(int type) } void -laptop_portable::apm_set_tqmask(bool , bool ) +laptop_portable::apm_set_mask(bool , bool ) { } @@ -2861,9 +2861,9 @@ int laptop_portable::has_hibernation() // explain to the user what they need to do if has_power_management() returned 0 // to get any software they lack // -KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparent) +KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *parent) { - KActiveLabel* explain = new KActiveLabel(i18n("Your computer or operating system is not supported by the current version of the\nKDE laptop control panels. If you want help porting these panels to work with it\nplease contact paul@taniwha.com."), tqparent); + KActiveLabel* explain = new KActiveLabel(i18n("Your computer or operating system is not supported by the current version of the\nKDE laptop control panels. If you want help porting these panels to work with it\nplease contact paul@taniwha.com."), parent); // INSERT HERE return(explain); } @@ -2871,9 +2871,9 @@ KActiveLabel *laptop_portable::no_power_management_explanation(TQWidget *tqparen // // explain to the user what they need to do to get suspend/resume to work from user mode // -TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent) +TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *parent) { - TQLabel* note = new TQLabel(" ", tqparent); + TQLabel* note = new TQLabel(" ", parent); // INSERT HERE return(note); } @@ -2883,12 +2883,12 @@ TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent) // pcmcia support - this will be replaced by better - pcmcia support being worked on by // others // -TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *tqparent) +TQLabel *laptop_portable::pcmcia_info(int x, TQWidget *parent) { // INSERT HERE if (x == 0) - return(new TQLabel(i18n("No PCMCIA controller detected"), tqparent)); - return(new TQLabel(i18n(""), tqparent)); + return(new TQLabel(i18n("No PCMCIA controller detected"), parent)); + return(new TQLabel(i18n(""), parent)); } // // puts us into standby mode @@ -2917,7 +2917,7 @@ void laptop_portable::invoke_hibernation() //ACPI specific - chances are you don't need to implement this one // void -laptop_portable::acpi_set_tqmask(bool, bool, bool, bool, bool ) +laptop_portable::acpi_set_mask(bool, bool, bool, bool, bool ) { // INSERT HERE } @@ -2929,7 +2929,7 @@ int laptop_portable::has_acpi(int) } void -laptop_portable::apm_set_tqmask(bool, bool) +laptop_portable::apm_set_mask(bool, bool) { // 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 *tqparent, KConfig *config, TQVBoxLayout *tqlayout) +laptop_portable::extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *tqlayout) { // INSERT HERE } @@ -3080,7 +3080,7 @@ laptop_portable::has_software_suspend(int type) } void -laptop_portable::software_suspend_set_tqmask(bool hibernate) +laptop_portable::software_suspend_set_mask(bool hibernate) { // software_suspend_is_preferred = hibernate; } diff --git a/klaptopdaemon/portable.h b/klaptopdaemon/portable.h index d530fd4..b4843e1 100644 --- a/klaptopdaemon/portable.h +++ b/klaptopdaemon/portable.h @@ -72,9 +72,9 @@ public: static void set_brightness(bool blank, int val); // val = 0-255 255 brightest, 0 means dimmest (if !blank it must be still visible), static int get_brightness(); // returns 0-255 brightness, -1 if you can't static TQString cpu_frequency(); // Returns the cpu freq. - static KActiveLabel *no_power_management_explanation(TQWidget *tqparent); - static TQLabel *how_to_do_suspend_resume(TQWidget *tqparent); - static TQLabel *pcmcia_info(int x, TQWidget *tqparent); + static KActiveLabel *no_power_management_explanation(TQWidget *parent); + static TQLabel *how_to_do_suspend_resume(TQWidget *parent); + static TQLabel *pcmcia_info(int x, TQWidget *parent); /** * Put this computer into standby mode. @@ -98,10 +98,10 @@ 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 *tqparent, KConfig *config, TQVBoxLayout *tqlayout); - static void acpi_set_tqmask(bool standby, bool suspend, bool hibernate, bool perf, bool throttle); - static void apm_set_tqmask(bool standby, bool suspend); - static void software_suspend_set_tqmask(bool hibernate); + 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); /** * Get a list of available performance profiles. diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp index e033148..fce096e 100644 --- a/klaptopdaemon/power.cpp +++ b/klaptopdaemon/power.cpp @@ -45,8 +45,8 @@ #include <tqtooltip.h> extern void wake_laptop_daemon(); -PowerConfig::PowerConfig (TQWidget * tqparent, const char *name) - : KCModule(tqparent, name), +PowerConfig::PowerConfig (TQWidget * parent, const char *name) + : KCModule(parent, name), nopowerBox(0), nopowerStandby(0), nopowerSuspend(0), diff --git a/klaptopdaemon/power.h b/klaptopdaemon/power.h index d856dcd..e27d901 100644 --- a/klaptopdaemon/power.h +++ b/klaptopdaemon/power.h @@ -43,7 +43,7 @@ class PowerConfig : public KCModule Q_OBJECT TQ_OBJECT public: - PowerConfig( TQWidget *tqparent=0, const char* name=0); + PowerConfig( TQWidget *parent=0, const char* name=0); ~PowerConfig(); void save( void ); void load(); diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp index d8f442f..b16ad1a 100644 --- a/klaptopdaemon/profile.cpp +++ b/klaptopdaemon/profile.cpp @@ -53,8 +53,8 @@ extern void wake_laptop_daemon(); -ProfileConfig::ProfileConfig(TQWidget * tqparent, const char *name) - : KCModule(tqparent, name) +ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) + : KCModule(parent, name) { TQStringList performance_list; int current_performance; diff --git a/klaptopdaemon/profile.h b/klaptopdaemon/profile.h index 2d44e59..1abadef 100644 --- a/klaptopdaemon/profile.h +++ b/klaptopdaemon/profile.h @@ -44,7 +44,7 @@ class ProfileConfig : public KCModule Q_OBJECT TQ_OBJECT public: - ProfileConfig( TQWidget *tqparent=0, const char* name=0); + ProfileConfig( TQWidget *parent=0, const char* name=0); ~ProfileConfig( ); void save( void ); diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp index c922fd5..497a566 100644 --- a/klaptopdaemon/sony.cpp +++ b/klaptopdaemon/sony.cpp @@ -55,8 +55,8 @@ extern void wake_laptop_daemon(); -SonyConfig::SonyConfig(TQWidget * tqparent, const char *name) - : KCModule(tqparent, name) +SonyConfig::SonyConfig(TQWidget * parent, const char *name) + : KCModule(parent, name) { KGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages diff --git a/klaptopdaemon/sony.h b/klaptopdaemon/sony.h index 80648e2..1f80d3c 100644 --- a/klaptopdaemon/sony.h +++ b/klaptopdaemon/sony.h @@ -43,7 +43,7 @@ class SonyConfig : public KCModule Q_OBJECT TQ_OBJECT public: - SonyConfig( TQWidget *tqparent=0, const char* name=0); + SonyConfig( TQWidget *parent=0, const char* name=0); ~SonyConfig( ); void save( void ); diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp index 826489a..84d8501 100644 --- a/klaptopdaemon/warning.cpp +++ b/klaptopdaemon/warning.cpp @@ -44,8 +44,8 @@ extern void wake_laptop_daemon(); -WarningConfig::WarningConfig (int t, TQWidget * tqparent, const char *name) - : KCModule(tqparent, name), +WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) + : KCModule(parent, name), checkSuspend(0), checkStandby(0), checkHibernate(0) diff --git a/klaptopdaemon/warning.h b/klaptopdaemon/warning.h index 2c52348..fa0383b 100644 --- a/klaptopdaemon/warning.h +++ b/klaptopdaemon/warning.h @@ -43,7 +43,7 @@ class WarningConfig : public KCModule Q_OBJECT TQ_OBJECT public: - WarningConfig(int x, TQWidget *tqparent=0, const char* name=0); + WarningConfig(int x, TQWidget *parent=0, const char* name=0); ~WarningConfig(); void save( void ); void load(); diff --git a/klaptopdaemon/xautolock_diy.c b/klaptopdaemon/xautolock_diy.c index 1aacf5e..c816ae9 100644 --- a/klaptopdaemon/xautolock_diy.c +++ b/klaptopdaemon/xautolock_diy.c @@ -95,7 +95,7 @@ static void selectEvents (Window window, Bool substructureOnly) { Window root; /* root window of the window */ - Window tqparent; /* tqparent of the window */ + Window parent; /* parent of the window */ Window* tqchildren; /* tqchildren of the window */ unsigned nofChildren = 0; /* number of tqchildren */ unsigned i; /* loop counter */ @@ -104,9 +104,9 @@ selectEvents (Window window, Bool substructureOnly) if( xautolock_ignoreWindow( window )) return; /* - * Start by querying the server about the root and tqparent windows. + * Start by querying the server about the root and parent windows. */ - if (!XQueryTree (queue.display, window, &root, &tqparent, + if (!XQueryTree (queue.display, window, &root, &parent, &tqchildren, &nofChildren)) { return; @@ -132,7 +132,7 @@ selectEvents (Window window, Bool substructureOnly) } else { - if (tqparent == None) /* the *real* rootwindow */ + if (parent == None) /* the *real* rootwindow */ { attribs.all_event_masks = attribs.do_not_propagate_mask = KeyPressMask; @@ -178,7 +178,7 @@ selectEvents (Window window, Bool substructureOnly) * XGrabServer(), but that'd be an impolite thing to do, and since it * isn't required... */ - if (!XQueryTree (queue.display, window, &root, &tqparent, + if (!XQueryTree (queue.display, window, &root, &parent, &tqchildren, &nofChildren)) { return; diff --git a/klaptopdaemon/xautolock_engine.c b/klaptopdaemon/xautolock_engine.c index c293d9e..bbce54e 100644 --- a/klaptopdaemon/xautolock_engine.c +++ b/klaptopdaemon/xautolock_engine.c @@ -74,7 +74,7 @@ xautolock_queryPointer (Display* d) { Window dummyWin; /* as it says */ int dummyInt; /* as it says */ - unsigned tqmask; /* modifier tqmask */ + unsigned mask; /* modifier mask */ int rootX; /* as it says */ int rootY; /* as it says */ int corner; /* corner index */ @@ -104,7 +104,7 @@ xautolock_queryPointer (Display* d) * of pointer events. */ if (!XQueryPointer (d, root, &root, &dummyWin, &rootX, &rootY, - &dummyInt, &dummyInt, &tqmask)) + &dummyInt, &dummyInt, &mask)) { /* * Pointer has moved to another screen, so let's find out which one. @@ -121,7 +121,7 @@ xautolock_queryPointer (Display* d) if ( rootX == prevRootX && rootY == prevRootY - && tqmask == prevMask) + && mask == prevMask) { xautolock_corner_t* corners = xautolock_corners; /* @@ -186,7 +186,7 @@ xautolock_queryPointer (Display* d) #endif prevRootX = rootX; prevRootY = rootY; - prevMask = tqmask; + prevMask = mask; xautolock_resetTriggers (); } diff --git a/kmilo/asus/asus.cpp b/kmilo/asus/asus.cpp index 12690f1..a83235d 100644 --- a/kmilo/asus/asus.cpp +++ b/kmilo/asus/asus.cpp @@ -42,7 +42,7 @@ namespace KMilo { -AsusMonitor::AsusMonitor(TQObject* tqparent, const char* name, const TQStringList& args): Monitor(tqparent, name, args) +AsusMonitor::AsusMonitor(TQObject* parent, const char* name, const TQStringList& args): Monitor(parent, name, args) { } diff --git a/kmilo/asus/asus.h b/kmilo/asus/asus.h index 1d1132d..c809eea 100644 --- a/kmilo/asus/asus.h +++ b/kmilo/asus/asus.h @@ -42,7 +42,7 @@ typedef struct */ class AsusMonitor: public Monitor { public: - AsusMonitor(TQObject *tqparent, const char *name, const TQStringList&); + AsusMonitor(TQObject *parent, const char *name, const TQStringList&); virtual ~AsusMonitor(); /** diff --git a/kmilo/delli8k/delli8k.cpp b/kmilo/delli8k/delli8k.cpp index 063fa74..d63c8c7 100644 --- a/kmilo/delli8k/delli8k.cpp +++ b/kmilo/delli8k/delli8k.cpp @@ -43,8 +43,8 @@ namespace KMilo { -DellI8kMonitor::DellI8kMonitor( TQObject* tqparent, const char* name, const TQStringList& args ) - : Monitor( tqparent, name, args ) +DellI8kMonitor::DellI8kMonitor( TQObject* parent, const char* name, const TQStringList& args ) + : Monitor( parent, name, args ) { } diff --git a/kmilo/delli8k/delli8k.h b/kmilo/delli8k/delli8k.h index 1d3ead8..424f80a 100644 --- a/kmilo/delli8k/delli8k.h +++ b/kmilo/delli8k/delli8k.h @@ -45,7 +45,7 @@ namespace KMilo { class DellI8kMonitor: public Monitor { public: - DellI8kMonitor( TQObject *tqparent, const char *name, const TQStringList& ); + DellI8kMonitor( TQObject *parent, const char *name, const TQStringList& ); virtual ~DellI8kMonitor(); /** diff --git a/kmilo/demo/demo.cpp b/kmilo/demo/demo.cpp index a2875f6..c985e08 100644 --- a/kmilo/demo/demo.cpp +++ b/kmilo/demo/demo.cpp @@ -26,8 +26,8 @@ namespace KMilo { -Demo::Demo(TQObject *tqparent, const char *name, const TQStringList& args) -: Monitor(tqparent, name, args) { +Demo::Demo(TQObject *parent, const char *name, const TQStringList& args) +: Monitor(parent, name, args) { } diff --git a/kmilo/demo/demo.h b/kmilo/demo/demo.h index 5a1aabe..a1d02d4 100644 --- a/kmilo/demo/demo.h +++ b/kmilo/demo/demo.h @@ -26,7 +26,7 @@ class Demo : public KMilo::Monitor { public: - Demo(TQObject *tqparent, const char *name, const TQStringList&); + Demo(TQObject *parent, const char *name, const TQStringList&); virtual ~Demo(); virtual bool init(); diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp index 6a4e1d2..4e13be1 100644 --- a/kmilo/generic/generic_monitor.cpp +++ b/kmilo/generic/generic_monitor.cpp @@ -42,8 +42,8 @@ using namespace KMilo; -GenericMonitor::GenericMonitor(TQObject *tqparent, const char *name, const TQStringList& args) -: Monitor(tqparent, name, args) +GenericMonitor::GenericMonitor(TQObject *parent, const char *name, const TQStringList& args) +: Monitor(parent, name, args) { _poll = false; m_displayType = Monitor::None; diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h index 5c35b61..c94606d 100644 --- a/kmilo/generic/generic_monitor.h +++ b/kmilo/generic/generic_monitor.h @@ -51,7 +51,7 @@ class GenericMonitor : public Monitor TQ_OBJECT public: - GenericMonitor(TQObject *tqparent, const char *name, const TQStringList&); + GenericMonitor(TQObject *parent, const char *name, const TQStringList&); virtual ~GenericMonitor(); virtual bool init(); diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index e8a05e2..5f8ac0e 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -46,8 +46,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kvaio, KVaioModuleFactory("kcmkvaio")) #define CONFIG_FILE "kmilodrc" -KVaioModule::KVaioModule(TQWidget *tqparent, const char *name, const TQStringList &) - : KCModule(KVaioModuleFactory::instance(), tqparent, name) +KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList &) + : KCModule(KVaioModuleFactory::instance(), parent, name) { KAboutData *about = new KAboutData(I18N_NOOP("kcmkvaio"), diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.h b/kmilo/kmilo_kvaio/kcmkvaio/main.h index b7dbade..20e0b64 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.h +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.h @@ -34,7 +34,7 @@ class KVaioModule : public KCModule TQ_OBJECT public: - KVaioModule(TQWidget *tqparent, const char *name, const TQStringList &); + KVaioModule(TQWidget *parent, const char *name, const TQStringList &); void save(); void load(); diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp index fa22f0b..7ecf253 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp @@ -26,9 +26,9 @@ #include "kvaio.h" #include "kmilointerface.h" -KMiloKVaio::KMiloKVaio(TQObject *tqparent, const char *name, +KMiloKVaio::KMiloKVaio(TQObject *parent, const char *name, const TQStringList& args) - : Monitor(tqparent, name, args), + : Monitor(parent, name, args), m_kvaio(0) { _poll = false; diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h index b351f58..28780af 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.h +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h @@ -38,7 +38,7 @@ class KMiloKVaio : public KMilo::Monitor { TQ_OBJECT public: - KMiloKVaio(TQObject *tqparent, + KMiloKVaio(TQObject *parent, const char *name, const TQStringList&); virtual ~KMiloKVaio(); diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index ed853f0..d527970 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -55,12 +55,12 @@ extern "C" { } -KVaio::KVaio(KMiloKVaio *tqparent, const char* name) - : TQObject(tqparent, name), +KVaio::KVaio(KMiloKVaio *parent, const char* name) + : TQObject(parent, name), mDisp(0), mTimer (new TQTimer (this) ) { - mytqparent = tqparent; + myparent = parent; mDriver = new KVaioDriverInterface(this); @@ -176,7 +176,7 @@ void KVaio::slotVaioEvent(int event) bool KVaio::showTextMsg(const TQString& msg) { - return mytqparent->showTextMsg(msg); + return myparent->showTextMsg(msg); } @@ -184,7 +184,7 @@ bool KVaio::showTextMsg(const TQString& msg) bool KVaio::showProgressMsg(const TQString& msg, int value) { m_progress = value; - return mytqparent->showProgressMsg(msg,value); + return myparent->showProgressMsg(msg,value); } void KVaio::blankScreen() diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h index 2e2d723..c012c66 100644 --- a/kmilo/kmilo_kvaio/kvaio.h +++ b/kmilo/kmilo_kvaio/kvaio.h @@ -58,8 +58,8 @@ class KVaio : public TQObject Q_OBJECT TQ_OBJECT public: -// KVaio(TQObject *tqparent = 0, const char *name =0); - KVaio(KMiloKVaio *tqparent = 0, const char *name =0); +// KVaio(TQObject *parent = 0, const char *name =0); + KVaio(KMiloKVaio *parent = 0, const char *name =0); virtual ~KVaio(); const KVaioDriverInterface *driver(); @@ -91,7 +91,7 @@ private: bool retrieveVolume(); void displayVolume(); - KMiloKVaio *mytqparent; + KMiloKVaio *myparent; DCOPRef *kmixClient, *kmixWindow; diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp index 873633d..a08ccff 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp @@ -64,8 +64,8 @@ extern "C" { #define SONYPI_IOCGBLUE _IOR('v', 8, __u8) #define SONYPI_IOCSBLUE _IOW('v', 9, __u8) -KVaioDriverInterface::KVaioDriverInterface(TQObject *tqparent) - : TQObject(tqparent), +KVaioDriverInterface::KVaioDriverInterface(TQObject *parent) + : TQObject(parent), mFd(0), mNotifier(0) { diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.h b/kmilo/kmilo_kvaio/kvaiodriverinterface.h index 6087b93..2cf7fee 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h @@ -36,7 +36,7 @@ class KVaioDriverInterface : public TQObject Q_OBJECT TQ_OBJECT public: - KVaioDriverInterface(TQObject *tqparent=0); + KVaioDriverInterface(TQObject *parent=0); bool connectToDriver(bool listen = true); void disconnectFromDriver(); /** Return the current display brightness, a value between 0 and diff --git a/kmilo/kmilod/monitor.cpp b/kmilo/kmilod/monitor.cpp index 955fccd..7f37aaa 100644 --- a/kmilo/kmilod/monitor.cpp +++ b/kmilo/kmilod/monitor.cpp @@ -22,8 +22,8 @@ #include "monitor.h" -KMilo::Monitor::Monitor(TQObject *tqparent, const char *name, const TQStringList&) -: TQObject(tqparent, name) { +KMilo::Monitor::Monitor(TQObject *parent, const char *name, const TQStringList&) +: TQObject(parent, name) { _poll = true; } diff --git a/kmilo/kmilod/monitor.h b/kmilo/kmilod/monitor.h index 7053752..d50045b 100644 --- a/kmilo/kmilod/monitor.h +++ b/kmilo/kmilod/monitor.h @@ -37,7 +37,7 @@ class KMiloInterface; class KDE_EXPORT Monitor : public TQObject { public: - Monitor(TQObject *tqparent, const char *name, const TQStringList&); + Monitor(TQObject *parent, const char *name, const TQStringList&); virtual ~Monitor(); /** diff --git a/kmilo/powerbook/pb_monitor.cpp b/kmilo/powerbook/pb_monitor.cpp index 516992e..5b1fae2 100644 --- a/kmilo/powerbook/pb_monitor.cpp +++ b/kmilo/powerbook/pb_monitor.cpp @@ -33,8 +33,8 @@ extern "C" { namespace KMilo { -PowerBookMonitor::PowerBookMonitor(TQObject *tqparent, const char *name, const TQStringList& args) -: Monitor(tqparent, name, args) { +PowerBookMonitor::PowerBookMonitor(TQObject *parent, const char *name, const TQStringList& args) +: Monitor(parent, name, args) { _serverPort = -1; _clientPort = -1; _progress = 0; diff --git a/kmilo/powerbook/pb_monitor.h b/kmilo/powerbook/pb_monitor.h index b4e4c85..13b9885 100644 --- a/kmilo/powerbook/pb_monitor.h +++ b/kmilo/powerbook/pb_monitor.h @@ -26,7 +26,7 @@ class PowerBookMonitor : public KMilo::Monitor { public: - PowerBookMonitor(TQObject *tqparent, const char *name, const TQStringList&); + PowerBookMonitor(TQObject *parent, const char *name, const TQStringList&); virtual ~PowerBookMonitor(); virtual bool init(); diff --git a/kmilo/powerbook2/pb_monitor.cpp b/kmilo/powerbook2/pb_monitor.cpp index 20ba17b..cf3b927 100644 --- a/kmilo/powerbook2/pb_monitor.cpp +++ b/kmilo/powerbook2/pb_monitor.cpp @@ -49,9 +49,9 @@ const TQString tpmodes[] = { I18N_NOOP("No Tap"), I18N_NOOP("Tap"), I18N_NOOP("D namespace KMilo { -PowerBookMonitor::PowerBookMonitor(TQObject *tqparent, const char *name, +PowerBookMonitor::PowerBookMonitor(TQObject *parent, const char *name, const TQStringList& args) - : Monitor(tqparent, name, args), + : Monitor(parent, name, args), m_progress( 0 ) { init_libpbb(); diff --git a/kmilo/powerbook2/pb_monitor.h b/kmilo/powerbook2/pb_monitor.h index 2adb4d8..e9dfb71 100644 --- a/kmilo/powerbook2/pb_monitor.h +++ b/kmilo/powerbook2/pb_monitor.h @@ -34,7 +34,7 @@ namespace KMilo { class PowerBookMonitor : public KMilo::Monitor { public: - PowerBookMonitor(TQObject *tqparent, const char *name, const TQStringList&); + PowerBookMonitor(TQObject *parent, const char *name, const TQStringList&); virtual ~PowerBookMonitor(); virtual bool init(); diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp index 2d31b0b..7ad2b08 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.cpp +++ b/kmilo/thinkpad/kcmthinkpad/main.cpp @@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_thinkpad, KCMThinkpadModuleFactory("kcmthinkpad" #define CONFIG_FILE "kmilodrc" -KCMThinkpadModule::KCMThinkpadModule(TQWidget* tqparent, const char* name, const TQStringList&) - : KCModule(KCMThinkpadModuleFactory::instance(), tqparent, name) { +KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&) + : KCModule(KCMThinkpadModuleFactory::instance(), parent, name) { KAboutData* about = new KAboutData(I18N_NOOP("kcmthinkpad"), I18N_NOOP("KDE Control Module for IBM Thinkpad " diff --git a/kmilo/thinkpad/kcmthinkpad/main.h b/kmilo/thinkpad/kcmthinkpad/main.h index 5719185..cda78c5 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.h +++ b/kmilo/thinkpad/kcmthinkpad/main.h @@ -34,7 +34,7 @@ class KCMThinkpadModule : public KCModule { TQ_OBJECT public: - KCMThinkpadModule(TQWidget* tqparent, const char* name, const TQStringList&); + KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&); void save(); void load(); diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp index 1625c69..034c6bd 100644 --- a/kmilo/thinkpad/thinkpad.cpp +++ b/kmilo/thinkpad/thinkpad.cpp @@ -43,7 +43,7 @@ namespace KMilo { -ThinkPadMonitor::ThinkPadMonitor(TQObject* tqparent, const char* name, const TQStringList& args): Monitor(tqparent, name, args) { +ThinkPadMonitor::ThinkPadMonitor(TQObject* parent, const char* name, const TQStringList& args): Monitor(parent, name, args) { m_progress = 0; m_volume = 50; //set in retrieveVolume() } diff --git a/kmilo/thinkpad/thinkpad.h b/kmilo/thinkpad/thinkpad.h index e4cd952..dc843ca 100644 --- a/kmilo/thinkpad/thinkpad.h +++ b/kmilo/thinkpad/thinkpad.h @@ -83,7 +83,7 @@ typedef struct { */ class ThinkPadMonitor : public Monitor { public: - ThinkPadMonitor(TQObject *tqparent, const char *name, const TQStringList&); + ThinkPadMonitor(TQObject *parent, const char *name, const TQStringList&); virtual ~ThinkPadMonitor(); /** diff --git a/kregexpeditor/Comments b/kregexpeditor/Comments index e9fc09d..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 tqparent, and the tqparent will never receive a + the size of its new parent, and the parent will never receive a 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/kmultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp index ba37b73..6e82e85 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp @@ -38,8 +38,8 @@ const uchar indexButtonBits[] = { }; -KMultiFormListBoxMultiVisible::KMultiFormListBoxMultiVisible(KMultiFormListBoxFactory *fact, TQWidget *tqparent, const char *name) - : TQScrollView(tqparent, name) +KMultiFormListBoxMultiVisible::KMultiFormListBoxMultiVisible(KMultiFormListBoxFactory *fact, TQWidget *parent, const char *name) + : TQScrollView(parent, name) { factory = fact; diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h index f0e5d79..172bb6f 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.h @@ -43,9 +43,9 @@ private: /** @param factory A factory used to generate the instances of KMultiFormListBoxEntry class which is repeated in the KMultiFormListBox - @param tqparent A pointer to the tqparent widget + @param parent A pointer to the parent widget */ - KMultiFormListBoxMultiVisible(KMultiFormListBoxFactory *factory, TQWidget *tqparent = 0, const char *name = 0); + KMultiFormListBoxMultiVisible(KMultiFormListBoxFactory *factory, TQWidget *parent = 0, const char *name = 0); /** @return The elements in the KMultiFormListBox diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp index 6f9246c..905634c 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.cpp @@ -27,10 +27,10 @@ #include "widgetwindow.h" #include "windowlistboxitem.h" -KMultiFormListBoxWindowed::KMultiFormListBoxWindowed(KMultiFormListBoxFactory *factory, TQWidget *tqparent, +KMultiFormListBoxWindowed::KMultiFormListBoxWindowed(KMultiFormListBoxFactory *factory, TQWidget *parent, bool showUpDownButtons, bool showHelpButton, TQString addButtonText,const char *name) - : TQWidget( tqparent, name ) + : TQWidget( parent, name ) { _layout = new TQVBoxLayout(this); diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h index ca3f8bf..764993e 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-windowed.h @@ -43,7 +43,7 @@ Q_OBJECT friend class KMultiFormListBox; private: - KMultiFormListBoxWindowed(KMultiFormListBoxFactory *factory, TQWidget *tqparent, + KMultiFormListBoxWindowed(KMultiFormListBoxFactory *factory, TQWidget *parent, bool showUpDownButtons, bool showHelpButton, TQString addButtonText, const char *name); diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp index 8ddb5c7..a455bae 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.cpp @@ -22,9 +22,9 @@ #include "kmultiformlistbox-multivisible.h" #include "kmultiformlistbox-windowed.h" -KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiFormListBoxType tp, TQWidget *tqparent, +KMultiFormListBox::KMultiFormListBox( KMultiFormListBoxFactory *factory, KMultiFormListBoxType tp, TQWidget *parent, bool showUpDownButtons, bool showHelpButton, TQString addButtonText, - const char *name ) : TQWidget( tqparent, name ) + const char *name ) : TQWidget( parent, name ) { switch ( tp ) { diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h index 0a23863..ba9b8a8 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox.h @@ -72,11 +72,11 @@ public: /** @param factory A factory used to generate the instances of KMultiFormListBoxEntry class which is repeated in the KMultiFormListBox - @param tqparent A pointer to the tqparent widget + @param parent A pointer to the parent widget **/ KMultiFormListBox(KMultiFormListBoxFactory *factory, KMultiFormListBoxType tp=Windowed, - TQWidget *tqparent = 0, bool showUpDownButtons = true, + TQWidget *parent = 0, bool showUpDownButtons = true, bool showHelpButton = true, TQString addButtonText = i18n("Add"), const char *name = 0); diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h index c51ac16..b4bf36c 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h @@ -51,7 +51,7 @@ class KMultiFormListBoxEntry : public TQWidget TQ_OBJECT public: - KMultiFormListBoxEntry(TQWidget *tqparent, const char *name) : TQWidget(tqparent,name) {} + KMultiFormListBoxEntry(TQWidget *parent, const char *name) : TQWidget(parent,name) {} virtual TQPushButton *indexButton() { return 0; } virtual TQWidget *valueWidget() { return 0; } diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp index 8432ccf..08a800a 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.cpp @@ -18,8 +18,8 @@ #include "kmultiformlistboxfactory.h" #include <tqframe.h> -TQWidget *KMultiFormListBoxFactory::separator(TQWidget *tqparent) { - TQFrame* sep = new TQFrame( tqparent ); +TQWidget *KMultiFormListBoxFactory::separator(TQWidget *parent) { + TQFrame* sep = new TQFrame( parent ); sep->setFrameStyle( TQFrame::HLine | TQFrame::Sunken); sep->setLineWidth(1); return sep; diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h b/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h index 61a78aa..dc0bcce 100644 --- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h +++ b/kregexpeditor/KMultiFormListBox/kmultiformlistboxfactory.h @@ -47,23 +47,23 @@ public: a subclass of this class. This instance will be owned by the caller of this function. - @param tqparent A pointer to the tqparent of this KMultiFormListBoxEntry widget + @param parent A pointer to the parent of this KMultiFormListBoxEntry widget returned. @return A fresh @ref KMultiFormListBoxEntry to be used in an instance of the @ref KMultiFormListBox class. **/ - virtual KMultiFormListBoxEntry *create(TQWidget *tqparent) = 0; + virtual KMultiFormListBoxEntry *create(TQWidget *parent) = 0; /** This method is used to get a separator between the elements in an @ref KMultiFormListBox. The widget returned from this method will be owned by the caller. - @param tqparent A pointer to the tqparent of the TQWidget returned. + @param parent A pointer to the parent of the TQWidget returned. @return A widget which must be used as a separator between the @ref KMultiFormListBoxEntry elements in an @ref KMultiFormListBox. **/ - virtual TQWidget *separator(TQWidget *tqparent); + virtual TQWidget *separator(TQWidget *parent); }; #endif /* kmultiformlistbox */ diff --git a/kregexpeditor/altnwidget.cpp b/kregexpeditor/altnwidget.cpp index ae13e43..25befe5 100644 --- a/kregexpeditor/altnwidget.cpp +++ b/kregexpeditor/altnwidget.cpp @@ -28,9 +28,9 @@ #include "altnregexp.h" #include <tqpainter.h> -AltnWidget::AltnWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, +AltnWidget::AltnWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) - :MultiContainerWidget(editorWindow, tqparent, name == 0 ? "AltnWidget" : name) + :MultiContainerWidget(editorWindow, parent, name == 0 ? "AltnWidget" : name) { DragAccepter *accepter = new DragAccepter(editorWindow, this); accepter->resize(0,0); // See note (1) in Comments @@ -39,8 +39,8 @@ AltnWidget::AltnWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, } AltnWidget::AltnWidget( AltnRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name) - :MultiContainerWidget( editorWindow, tqparent, name ) + TQWidget* parent, const char* name) + :MultiContainerWidget( editorWindow, parent, name ) { DragAccepter *accepter = new DragAccepter(editorWindow, this); accepter->resize(0,0); // See note (1) in Comments @@ -52,7 +52,7 @@ AltnWidget::AltnWidget( AltnRegExp* regexp, RegExpEditorWindow* editorWindow, RegExpWidget* child = WidgetFactory::createWidget( *it, editorWindow, this ); ConcWidget* conc; if ( ! (conc = dynamic_cast<ConcWidget*>( child ) ) ) { - conc = new ConcWidget( editorWindow, child, tqparent ); + conc = new ConcWidget( editorWindow, child, parent ); } append( conc ); } diff --git a/kregexpeditor/altnwidget.h b/kregexpeditor/altnwidget.h index 8b76a66..519eba5 100644 --- a/kregexpeditor/altnwidget.h +++ b/kregexpeditor/altnwidget.h @@ -29,10 +29,10 @@ class AltnRegExp; class AltnWidget :public MultiContainerWidget { public: - AltnWidget( RegExpEditorWindow* editorWindow, TQWidget *tqparent, + AltnWidget( RegExpEditorWindow* editorWindow, TQWidget *parent, const char *label = 0); AltnWidget( AltnRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name = 0); + TQWidget* parent, const char* name = 0); virtual void addNewChild(DragAccepter *accepter, RegExpWidget *child); virtual TQSize tqsizeHint() const; virtual RegExp* regExp() const; diff --git a/kregexpeditor/auxbuttons.cpp b/kregexpeditor/auxbuttons.cpp index d22d229..855f6d1 100644 --- a/kregexpeditor/auxbuttons.cpp +++ b/kregexpeditor/auxbuttons.cpp @@ -32,8 +32,8 @@ #include <tqtoolbutton.h> #include "util.h" -AuxButtons::AuxButtons( TQWidget* tqparent, const char* name = 0) - :TQDockWindow( TQDockWindow::InDock, tqparent, name) +AuxButtons::AuxButtons( TQWidget* parent, const char* name = 0) + :TQDockWindow( TQDockWindow::InDock, parent, name) { TQBoxLayout* tqlayout = boxLayout(); diff --git a/kregexpeditor/auxbuttons.h b/kregexpeditor/auxbuttons.h index a0ada03..d16b7c7 100644 --- a/kregexpeditor/auxbuttons.h +++ b/kregexpeditor/auxbuttons.h @@ -29,7 +29,7 @@ class AuxButtons :public TQDockWindow TQ_OBJECT public: - AuxButtons( TQWidget* tqparent, const char* name ); + AuxButtons( TQWidget* parent, const char* name ); signals: void undo(); diff --git a/kregexpeditor/characterswidget.cpp b/kregexpeditor/characterswidget.cpp index 2656c2f..227f605 100644 --- a/kregexpeditor/characterswidget.cpp +++ b/kregexpeditor/characterswidget.cpp @@ -39,16 +39,16 @@ CharacterEdits* CharactersWidget::_configWindow = 0; -CharactersWidget::CharactersWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, +CharactersWidget::CharactersWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) - : RegExpWidget(editorWindow, tqparent, name) + : RegExpWidget(editorWindow, parent, name) { _regexp = new TextRangeRegExp( false /* not used */); } CharactersWidget::CharactersWidget( TextRangeRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name ) - : RegExpWidget( editorWindow, tqparent, name ) + TQWidget* parent, const char* name ) + : RegExpWidget( editorWindow, parent, name ) { _regexp = dynamic_cast<TextRangeRegExp*>( regexp->clone() ); Q_ASSERT( _regexp ); @@ -181,7 +181,7 @@ int CharactersWidget::edit() { if ( _configWindow == 0 ) { TQApplication::setOverrideCursor( WaitCursor ); - // No tqparent here, as this window should continue to exists. + // No parent here, as this window should continue to exists. _configWindow = new CharacterEdits( 0, "CharactersWidget::_configWindow" ); TQApplication::restoreOverrideCursor(); } @@ -282,8 +282,8 @@ int CharacterEdits::exec( TextRangeRegExp* regexp ) } -CharacterEdits::CharacterEdits( TQWidget *tqparent, const char *name) - : KDialogBase( tqparent, name == 0 ? "CharacterEdits" : name, true, +CharacterEdits::CharacterEdits( TQWidget *parent, const char *name) + : KDialogBase( parent, name == 0 ? "CharacterEdits" : name, true, i18n("Specify Characters"), KDialogBase::Ok | KDialogBase::Cancel) { @@ -377,8 +377,8 @@ void CharacterEdits::slotOK() } -SingleEntry::SingleEntry(TQWidget* tqparent, const char* name ) - :KMultiFormListBoxEntry( tqparent, name ) +SingleEntry::SingleEntry(TQWidget* parent, const char* name ) + :KMultiFormListBoxEntry( parent, name ) { TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 3, 6 ); _selector = new CharSelector( this ); @@ -402,8 +402,8 @@ bool SingleEntry::isEmpty() const } -RangeEntry::RangeEntry(TQWidget* tqparent, const char* name ) - :KMultiFormListBoxEntry( tqparent, name ) +RangeEntry::RangeEntry(TQWidget* parent, const char* name ) + :KMultiFormListBoxEntry( parent, name ) { TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 3, 6 ); diff --git a/kregexpeditor/characterswidget.h b/kregexpeditor/characterswidget.h index f8cf390..ccc8852 100644 --- a/kregexpeditor/characterswidget.h +++ b/kregexpeditor/characterswidget.h @@ -41,10 +41,10 @@ class TQCheckBox; class CharactersWidget :public RegExpWidget { public: - CharactersWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, + CharactersWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *label = 0); CharactersWidget( TextRangeRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); ~CharactersWidget(); virtual TQSize tqsizeHint() const; virtual RegExp* regExp() const; @@ -72,7 +72,7 @@ private: class SingleEntry :public KMultiFormListBoxEntry { public: - SingleEntry(TQWidget* tqparent, const char* name = 0 ); + SingleEntry(TQWidget* parent, const char* name = 0 ); TQString text() const; void setText( TQString text ); bool isEmpty() const; @@ -87,7 +87,7 @@ private: class RangeEntry :public KMultiFormListBoxEntry { public: - RangeEntry(TQWidget* tqparent, const char* name = 0 ); + RangeEntry(TQWidget* parent, const char* name = 0 ); TQString fromText() const; TQString toText() const; void setFrom( TQString text ); @@ -103,7 +103,7 @@ private: class SingleFactory :public KMultiFormListBoxFactory { public: - KMultiFormListBoxEntry *create(TQWidget *tqparent) { return new SingleEntry( tqparent ); } + KMultiFormListBoxEntry *create(TQWidget *parent) { return new SingleEntry( parent ); } TQWidget *separator( TQWidget* ) { return 0; } }; @@ -113,7 +113,7 @@ public: class RangeFactory :public KMultiFormListBoxFactory { public: - KMultiFormListBoxEntry *create(TQWidget *tqparent) { return new RangeEntry( tqparent ); } + KMultiFormListBoxEntry *create(TQWidget *parent) { return new RangeEntry( parent ); } TQWidget *separator( TQWidget* ) { return 0; } }; @@ -125,7 +125,7 @@ class CharacterEdits : public KDialogBase Q_OBJECT TQ_OBJECT public: - CharacterEdits(TQWidget *tqparent = 0, const char *name = 0); + CharacterEdits(TQWidget *parent = 0, const char *name = 0); public slots: int exec( TextRangeRegExp* regexp ); diff --git a/kregexpeditor/charselector.cpp b/kregexpeditor/charselector.cpp index d5f0a07..5f60475 100644 --- a/kregexpeditor/charselector.cpp +++ b/kregexpeditor/charselector.cpp @@ -41,7 +41,7 @@ class StackContainer :public TQWidget { public: - StackContainer( TQWidget* child, TQWidget* tqparent ) : TQWidget( tqparent ) + StackContainer( TQWidget* child, TQWidget* parent ) : TQWidget( parent ) { TQHBoxLayout* tqlayout = new TQHBoxLayout( this ); child->reparent( this, TQPoint(0,0), false ); @@ -50,8 +50,8 @@ public: } }; -CharSelector::CharSelector( TQWidget* tqparent, const char* name ) - :TQWidget( tqparent, name ), _oldIndex(0) +CharSelector::CharSelector( TQWidget* parent, const char* name ) + :TQWidget( parent, name ), _oldIndex(0) { TQStringList items; TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 0, 6 ); diff --git a/kregexpeditor/charselector.h b/kregexpeditor/charselector.h index 5ba2a88..c34ffac 100644 --- a/kregexpeditor/charselector.h +++ b/kregexpeditor/charselector.h @@ -30,7 +30,7 @@ class CharSelector :public TQWidget TQ_OBJECT public: - CharSelector( TQWidget* tqparent, const char* name = 0 ); + CharSelector( TQWidget* parent, const char* name = 0 ); TQString text() const; void setText( TQString text ); bool isEmpty() const; diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp index 00c484c..c43dcbb 100644 --- a/kregexpeditor/compoundwidget.cpp +++ b/kregexpeditor/compoundwidget.cpp @@ -37,8 +37,8 @@ //================================================================================ -CompoundDetailWindow::CompoundDetailWindow( TQWidget* tqparent, const char* name ) - :TQWidget( tqparent, name ) +CompoundDetailWindow::CompoundDetailWindow( TQWidget* parent, const char* name ) + :TQWidget( parent, name ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); @@ -93,17 +93,17 @@ void CompoundDetailWindow::setAllowReplace( bool b ) //================================================================================ -CompoundWidget::CompoundWidget( RegExpEditorWindow* editorWindow, TQWidget* tqparent, +CompoundWidget::CompoundWidget( RegExpEditorWindow* editorWindow, TQWidget* parent, const char* name ) - :SingleContainerWidget( editorWindow, tqparent, name == 0 ? "CompoundWidget" : name ) + :SingleContainerWidget( editorWindow, parent, name == 0 ? "CompoundWidget" : name ) { _child = new ConcWidget( editorWindow, this ); init(); } CompoundWidget::CompoundWidget( CompoundRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name ) - : SingleContainerWidget( editorWindow, tqparent, name == 0 ? "CompoundWidget" : name ) + TQWidget* parent, const char* name ) + : SingleContainerWidget( editorWindow, parent, name == 0 ? "CompoundWidget" : name ) { init(); _content->setTitle( regexp->title() ); diff --git a/kregexpeditor/compoundwidget.h b/kregexpeditor/compoundwidget.h index 8a803a3..047f942 100644 --- a/kregexpeditor/compoundwidget.h +++ b/kregexpeditor/compoundwidget.h @@ -32,7 +32,7 @@ class TQCheckBox; class CompoundDetailWindow :public TQWidget { public: - CompoundDetailWindow(TQWidget* tqparent, const char* name = 0); + CompoundDetailWindow(TQWidget* parent, const char* name = 0); TQString title() const; TQString description() const; bool allowReplace() const; @@ -63,10 +63,10 @@ Q_OBJECT TQ_OBJECT public: - CompoundWidget( RegExpEditorWindow* editorWindow, TQWidget* tqparent, + CompoundWidget( RegExpEditorWindow* editorWindow, TQWidget* parent, const char* name = 0); CompoundWidget( CompoundRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name = 0); + TQWidget* parent, const char* name = 0); virtual bool updateSelection( bool parentSelected ); virtual TQSize tqsizeHint() const; diff --git a/kregexpeditor/concwidget.cpp b/kregexpeditor/concwidget.cpp index d70e735..16690be 100644 --- a/kregexpeditor/concwidget.cpp +++ b/kregexpeditor/concwidget.cpp @@ -21,9 +21,9 @@ #include <tqpainter.h> -ConcWidget::ConcWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, +ConcWidget::ConcWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) - :MultiContainerWidget(editorWindow, tqparent, name == 0 ? "concwidget" : name) + :MultiContainerWidget(editorWindow, parent, name == 0 ? "concwidget" : name) { init(); DragAccepter *accepter = new DragAccepter(editorWindow, this); @@ -33,8 +33,8 @@ ConcWidget::ConcWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, ConcWidget::ConcWidget(RegExpEditorWindow* editorWindow, RegExpWidget *child, - TQWidget *tqparent, const char *name) - :MultiContainerWidget(editorWindow, tqparent, name == 0 ? "concwidget" : name) + TQWidget *parent, const char *name) + :MultiContainerWidget(editorWindow, parent, name == 0 ? "concwidget" : name) { init(); DragAccepter *accepter = new DragAccepter(editorWindow, this); @@ -58,8 +58,8 @@ ConcWidget::ConcWidget( RegExpEditorWindow* editorWindow, ConcWidget* origConc, } ConcWidget::ConcWidget( ConcRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name ) - :MultiContainerWidget( editorWindow, tqparent, name == 0 ? "concwidget" : name ) + TQWidget* parent, const char* name ) + :MultiContainerWidget( editorWindow, parent, name == 0 ? "concwidget" : name ) { init(); DragAccepter *accepter = new DragAccepter(editorWindow, this); diff --git a/kregexpeditor/concwidget.h b/kregexpeditor/concwidget.h index 49f6308..bff85a7 100644 --- a/kregexpeditor/concwidget.h +++ b/kregexpeditor/concwidget.h @@ -30,14 +30,14 @@ class ConcRegExp; class ConcWidget :public MultiContainerWidget { public: - ConcWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, + ConcWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name = 0); ConcWidget(RegExpEditorWindow* editorWindow, RegExpWidget *child, - TQWidget *tqparent, const char *name=0); + TQWidget *parent, const char *name=0); ConcWidget( RegExpEditorWindow* editorWindow, ConcWidget* origConc, unsigned int start, unsigned int end); ConcWidget( ConcRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name = 0); + TQWidget* parent, const char* name = 0); void init(); virtual TQSize tqsizeHint() const; diff --git a/kregexpeditor/dcbutton.cpp b/kregexpeditor/dcbutton.cpp index 770b101..754b305 100644 --- a/kregexpeditor/dcbutton.cpp +++ b/kregexpeditor/dcbutton.cpp @@ -23,8 +23,8 @@ #include "dcbutton.h" -DoubleClickButton::DoubleClickButton( TQPixmap pixmap, TQWidget* tqparent, const char* name ) - : TQToolButton( tqparent, name ? name : "DoubleClickButton" ) +DoubleClickButton::DoubleClickButton( TQPixmap pixmap, TQWidget* parent, const char* name ) + : TQToolButton( parent, name ? name : "DoubleClickButton" ) { setPixmap( pixmap ); } diff --git a/kregexpeditor/dcbutton.h b/kregexpeditor/dcbutton.h index 0bdd2ca..8f56505 100644 --- a/kregexpeditor/dcbutton.h +++ b/kregexpeditor/dcbutton.h @@ -31,7 +31,7 @@ Q_OBJECT TQ_OBJECT public: - DoubleClickButton( TQPixmap pix, TQWidget* tqparent, const char* name = 0); + DoubleClickButton( TQPixmap pix, TQWidget* parent, const char* name = 0); protected: virtual void mouseDoubleClickEvent ( TQMouseEvent * ); diff --git a/kregexpeditor/drag.cpp b/kregexpeditor/drag.cpp index 51197a4..9c2b1ca 100644 --- a/kregexpeditor/drag.cpp +++ b/kregexpeditor/drag.cpp @@ -37,13 +37,13 @@ bool RegExpWidgetDrag::canDecode( TQDragMoveEvent* event ) } RegExpWidget* RegExpWidgetDrag::decode(TQDropEvent* event, RegExpEditorWindow* window, - TQWidget* tqparent) + TQWidget* parent) { TQByteArray payload = event->tqencodedData("KRegExpEditor/widgetdrag" ); TQTextStream stream( payload, IO_ReadOnly ); TQString str = stream.read(); RegExp* regexp = WidgetFactory::createRegExp( str ); - RegExpWidget* widget = WidgetFactory::createWidget( regexp, window, tqparent ); + RegExpWidget* widget = WidgetFactory::createWidget( regexp, window, parent ); delete regexp; return widget; } diff --git a/kregexpeditor/drag.h b/kregexpeditor/drag.h index 7173444..699d1e8 100644 --- a/kregexpeditor/drag.h +++ b/kregexpeditor/drag.h @@ -37,7 +37,7 @@ public: virtual TQByteArray tqencodedData ( const char * ) const; static bool canDecode(TQDragMoveEvent* event); static RegExpWidget* decode(TQDropEvent* event, RegExpEditorWindow* window, - TQWidget* tqparent); + TQWidget* parent); private: RegExp* _regexp; }; diff --git a/kregexpeditor/dragaccepter.cpp b/kregexpeditor/dragaccepter.cpp index 676c851..6bd049e 100644 --- a/kregexpeditor/dragaccepter.cpp +++ b/kregexpeditor/dragaccepter.cpp @@ -20,9 +20,9 @@ #include <tqpainter.h> -DragAccepter::DragAccepter(RegExpEditorWindow* editorWindow, RegExpWidget *tqparent, +DragAccepter::DragAccepter(RegExpEditorWindow* editorWindow, RegExpWidget *parent, const char *name) - : RegExpWidget(editorWindow, tqparent, name == 0 ? "dragaccepter" : name ), + : RegExpWidget(editorWindow, parent, name == 0 ? "dragaccepter" : name ), _drawLine( false ) { setAcceptDrops(TRUE); @@ -68,7 +68,7 @@ void DragAccepter::mouseReleaseEvent( TQMouseEvent* event ) Q_ASSERT( elm ); - RegExpWidget *w = dynamic_cast<RegExpWidget*>(tqparent()); + RegExpWidget *w = dynamic_cast<RegExpWidget*>(parent()); if (w) w->addNewConcChild(this, elm); _editorWindow->updateContent( this ); @@ -82,10 +82,10 @@ void DragAccepter::mouseReleaseEvent( TQMouseEvent* event ) } else { RegExpWidget *child = WidgetFactory::createWidget( _editorWindow, - dynamic_cast<TQWidget*>(tqparent()), + dynamic_cast<TQWidget*>(parent()), _editorWindow->insertType() ); if ( child ) { - RegExpWidget *w = dynamic_cast<RegExpWidget*>(tqparent()); + RegExpWidget *w = dynamic_cast<RegExpWidget*>(parent()); if (w) w->addNewChild(this, child); _editorWindow->updateContent( child ); @@ -107,7 +107,7 @@ void DragAccepter::dragEnterEvent(TQDragEnterEvent *event) void DragAccepter::dropEvent(TQDropEvent *event) { // The widget will be reparent afterward or part of it will, so no need to give - // it a tqparent here. + // it a parent here. RegExpWidget *newElm = RegExpWidgetDrag::decode( event, _editorWindow, 0 ); ConcWidget* elm; if ( !(elm = dynamic_cast<ConcWidget*>( newElm ) ) ) { @@ -116,10 +116,10 @@ void DragAccepter::dropEvent(TQDropEvent *event) Q_ASSERT( elm ); - RegExpWidget *rew = dynamic_cast<RegExpWidget*>(tqparent()); + RegExpWidget *rew = dynamic_cast<RegExpWidget*>(parent()); if (rew) rew->addNewConcChild(this, elm); - TQWidget *w = dynamic_cast<TQWidget*>(tqparent()); + TQWidget *w = dynamic_cast<TQWidget*>(parent()); if (w) w->update(); _editorWindow->updateContent( this ); diff --git a/kregexpeditor/dragaccepter.h b/kregexpeditor/dragaccepter.h index cead17f..a3737d9 100644 --- a/kregexpeditor/dragaccepter.h +++ b/kregexpeditor/dragaccepter.h @@ -30,7 +30,7 @@ class DragAccepter :public RegExpWidget friend class MultiContainerWidget; public: - DragAccepter(RegExpEditorWindow* editorWindow, RegExpWidget *tqparent, + DragAccepter(RegExpEditorWindow* editorWindow, RegExpWidget *parent, const char *name = 0); TQSize tqsizeHint() const; virtual RegExp* regExp() const; diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp index 8b87998..8e3cc20 100644 --- a/kregexpeditor/editorwindow.cpp +++ b/kregexpeditor/editorwindow.cpp @@ -41,8 +41,8 @@ #include "userdefinedregexps.h" #include <tqfileinfo.h> -RegExpEditorWindow::RegExpEditorWindow( TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name, TQt::WPaintUnclipped) +RegExpEditorWindow::RegExpEditorWindow( TQWidget *parent, const char *name) + : TQWidget(parent, name, TQt::WPaintUnclipped) { _top = new ConcWidget(this, this); _layout = new TQHBoxLayout( this); diff --git a/kregexpeditor/editorwindow.h b/kregexpeditor/editorwindow.h index f1484f1..58377c6 100644 --- a/kregexpeditor/editorwindow.h +++ b/kregexpeditor/editorwindow.h @@ -49,7 +49,7 @@ class RegExpEditorWindow :public TQWidget TQ_OBJECT public: - RegExpEditorWindow(TQWidget *tqparent, const char *name = 0); + RegExpEditorWindow(TQWidget *parent, const char *name = 0); /** Returns an object which represent the regular expression "drawn" in diff --git a/kregexpeditor/infopage.cpp b/kregexpeditor/infopage.cpp index 90ff202..42d473e 100644 --- a/kregexpeditor/infopage.cpp +++ b/kregexpeditor/infopage.cpp @@ -24,8 +24,8 @@ #include "infopage.h" -InfoPage::InfoPage( TQWidget* tqparent, const char* name ) - :KTextBrowser( tqparent, name ) +InfoPage::InfoPage( TQWidget* parent, const char* name ) + :KTextBrowser( parent, name ) { TQString txt = TQString::tqfromLatin1( "<qt>" ) + diff --git a/kregexpeditor/infopage.h b/kregexpeditor/infopage.h index 6367cda..24796d2 100644 --- a/kregexpeditor/infopage.h +++ b/kregexpeditor/infopage.h @@ -28,7 +28,7 @@ class InfoPage :public KTextBrowser { public: - InfoPage( TQWidget* tqparent, const char* name ); + InfoPage( TQWidget* parent, const char* name ); virtual void setSource ( const TQString& name ); }; diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp index 11a0264..95c0f25 100644 --- a/kregexpeditor/kregexpeditorgui.cpp +++ b/kregexpeditor/kregexpeditorgui.cpp @@ -34,9 +34,9 @@ const TQString KRegExpEditorGUI::version = TQString::fromLocal8Bit("1.0"); -KRegExpEditorGUI::KRegExpEditorGUI(TQWidget *tqparent, const char *name, +KRegExpEditorGUI::KRegExpEditorGUI(TQWidget *parent, const char *name, const TQStringList & ) - : TQWidget( tqparent, name) + : TQWidget( parent, name) { TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 6 ); _editor = new KRegExpEditorPrivate( this, "_editor" ); @@ -66,12 +66,12 @@ void KRegExpEditorGUI::setRegExp( const TQString ®exp ) _editor->slotSetRegexp( regexp ); } -KRegExpEditorGUIDialog::KRegExpEditorGUIDialog( TQWidget *tqparent, +KRegExpEditorGUIDialog::KRegExpEditorGUIDialog( TQWidget *parent, const char *name, const TQStringList & ) : KDialogBase( KDialogBase::Plain, i18n("Regular Expression Editor"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help, KDialogBase::Ok, - tqparent, name ? name : "KRegExpDialog" ) + parent, name ? name : "KRegExpDialog" ) { TQFrame* frame = plainPage(); TQVBoxLayout* tqlayout = new TQVBoxLayout( frame, 6 ); diff --git a/kregexpeditor/kregexpeditorgui.h b/kregexpeditor/kregexpeditorgui.h index 96eb234..58ecc65 100644 --- a/kregexpeditor/kregexpeditorgui.h +++ b/kregexpeditor/kregexpeditorgui.h @@ -40,7 +40,7 @@ class KDE_EXPORT KRegExpEditorGUI :public TQWidget, public KRegExpEditorInterfa TQ_OBJECT TQ_PROPERTY( TQString regexp READ regExp WRITE setRegExp ) public: - KRegExpEditorGUI( TQWidget *tqparent, const char *name = 0, + KRegExpEditorGUI( TQWidget *parent, const char *name = 0, const TQStringList & = TQStringList() ); virtual TQString regExp() const; @@ -70,7 +70,7 @@ class KDE_EXPORT KRegExpEditorGUIDialog : public KDialogBase, public KRegExpEdit TQ_OBJECT TQ_PROPERTY( TQString regexp READ regExp WRITE setRegExp ) public: - KRegExpEditorGUIDialog( TQWidget *tqparent, const char *name, const TQStringList &args ); + KRegExpEditorGUIDialog( TQWidget *parent, const char *name, const TQStringList &args ); virtual TQString regExp() const; diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp index 2150293..5d9df7a 100644 --- a/kregexpeditor/kregexpeditorprivate.cpp +++ b/kregexpeditor/kregexpeditorprivate.cpp @@ -46,8 +46,8 @@ #include "verifybuttons.h" #include <tqwhatsthis.h> -KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), _updating( false ), _autoVerify( true ) +KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) + : TQWidget(parent, name), _updating( false ), _autoVerify( true ) { setMinimumSize(730,300); TQDockArea* area = new TQDockArea(Qt::Horizontal, TQDockArea::Normal, this ); diff --git a/kregexpeditor/kregexpeditorprivate.h b/kregexpeditor/kregexpeditorprivate.h index effbdd7..ce7bc63 100644 --- a/kregexpeditor/kregexpeditorprivate.h +++ b/kregexpeditor/kregexpeditorprivate.h @@ -49,7 +49,7 @@ class KRegExpEditorPrivate :public TQWidget TQ_OBJECT public: - KRegExpEditorPrivate( TQWidget *tqparent, const char *name = 0 ); + KRegExpEditorPrivate( TQWidget *parent, const char *name = 0 ); TQString regexp(); void setMinimal( bool ); void setCaseSensitive( bool ); diff --git a/kregexpeditor/limitedcharlineedit.cpp b/kregexpeditor/limitedcharlineedit.cpp index 7137b5e..59a6309 100644 --- a/kregexpeditor/limitedcharlineedit.cpp +++ b/kregexpeditor/limitedcharlineedit.cpp @@ -25,8 +25,8 @@ class Validator :public TQValidator { public: - Validator( LimitedCharLineEdit::Mode mode, TQWidget* tqparent ) - :TQValidator( TQT_TQOBJECT(tqparent), "Validator" ), _mode(mode) + Validator( LimitedCharLineEdit::Mode mode, TQWidget* parent ) + :TQValidator( TQT_TQOBJECT(parent), "Validator" ), _mode(mode) { } @@ -56,8 +56,8 @@ void LimitedCharLineEdit::keyPressEvent ( TQKeyEvent *event ) focusNextPrevChild(true); } -LimitedCharLineEdit::LimitedCharLineEdit( Mode mode, TQWidget* tqparent, const char* name ) - :TQLineEdit( tqparent, name ), _mode(mode) +LimitedCharLineEdit::LimitedCharLineEdit( Mode mode, TQWidget* parent, const char* name ) + :TQLineEdit( parent, name ), _mode(mode) { if ( mode == NORMAL ) _count = 1; diff --git a/kregexpeditor/limitedcharlineedit.h b/kregexpeditor/limitedcharlineedit.h index 4b76250..98359a2 100644 --- a/kregexpeditor/limitedcharlineedit.h +++ b/kregexpeditor/limitedcharlineedit.h @@ -29,7 +29,7 @@ class LimitedCharLineEdit :public TQLineEdit public: enum Mode { NORMAL = 0, HEX = 1, OCT = 2 }; - LimitedCharLineEdit(Mode mode, TQWidget* tqparent, const char *name = 0); + LimitedCharLineEdit(Mode mode, TQWidget* parent, const char *name = 0); protected: virtual void keyPressEvent ( TQKeyEvent * ); diff --git a/kregexpeditor/lookaheadwidget.cpp b/kregexpeditor/lookaheadwidget.cpp index 95e9c5c..c5dc700 100644 --- a/kregexpeditor/lookaheadwidget.cpp +++ b/kregexpeditor/lookaheadwidget.cpp @@ -28,16 +28,16 @@ #include "concwidget.h" #include <tqpainter.h> -LookAheadWidget::LookAheadWidget( RegExpEditorWindow* editorWindow, RegExpType tp, TQWidget* tqparent, const char* name ) - :SingleContainerWidget(editorWindow, tqparent, name ? name : "LookAheadWidget" ), _tp(tp) +LookAheadWidget::LookAheadWidget( RegExpEditorWindow* editorWindow, RegExpType tp, TQWidget* parent, const char* name ) + :SingleContainerWidget(editorWindow, parent, name ? name : "LookAheadWidget" ), _tp(tp) { _child = new ConcWidget( editorWindow, this ); init(); } LookAheadWidget::LookAheadWidget( LookAheadRegExp* regexp, RegExpEditorWindow* editorWindow, RegExpType tp, - TQWidget* tqparent, const char* name ) - :SingleContainerWidget( editorWindow, tqparent, name ? name : "LookAheadWidget" ), _tp(tp) + TQWidget* parent, const char* name ) + :SingleContainerWidget( editorWindow, parent, name ? name : "LookAheadWidget" ), _tp(tp) { RegExpWidget* child = WidgetFactory::createWidget( regexp->child(), editorWindow, this ); if ( ! (_child = dynamic_cast<ConcWidget*>( child ) ) ) diff --git a/kregexpeditor/lookaheadwidget.h b/kregexpeditor/lookaheadwidget.h index e5825b8..302090a 100644 --- a/kregexpeditor/lookaheadwidget.h +++ b/kregexpeditor/lookaheadwidget.h @@ -26,9 +26,9 @@ class LookAheadWidget :public SingleContainerWidget Q_OBJECT TQ_OBJECT public: - LookAheadWidget( RegExpEditorWindow* editorWindow, RegExpType tp, TQWidget* tqparent, const char* name = 0 ); + LookAheadWidget( RegExpEditorWindow* editorWindow, RegExpType tp, TQWidget* parent, const char* name = 0 ); LookAheadWidget( LookAheadRegExp* regexp, RegExpEditorWindow* editorWindow, RegExpType tp, - TQWidget* tqparent, const char* name = 0); + TQWidget* parent, const char* name = 0); virtual RegExp* regExp() const; virtual RegExpType type() const { return _tp; } diff --git a/kregexpeditor/multicontainerwidget.cpp b/kregexpeditor/multicontainerwidget.cpp index 152f7a3..d8bef97 100644 --- a/kregexpeditor/multicontainerwidget.cpp +++ b/kregexpeditor/multicontainerwidget.cpp @@ -19,8 +19,8 @@ #include "dragaccepter.h" MultiContainerWidget::MultiContainerWidget( RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name) - :RegExpWidget( editorWindow, tqparent, name ) + TQWidget* parent, const char* name) + :RegExpWidget( editorWindow, parent, name ) { } @@ -150,7 +150,7 @@ bool MultiContainerWidget::updateSelection(bool parentSelected) RegExpWidget* child = _tqchildren.at(k); bool select; if ( k == 0 || k == (int)_tqchildren.count()-1) { - // The elements at the border is only selected if the tqparent is selected. + // The elements at the border is only selected if the parent is selected. select = _isSelected; } else { diff --git a/kregexpeditor/multicontainerwidget.h b/kregexpeditor/multicontainerwidget.h index 8194eb1..560baa0 100644 --- a/kregexpeditor/multicontainerwidget.h +++ b/kregexpeditor/multicontainerwidget.h @@ -27,7 +27,7 @@ class MultiContainerWidget :public RegExpWidget { public: - MultiContainerWidget( RegExpEditorWindow* editorWindow, TQWidget* tqparent = 0, + MultiContainerWidget( RegExpEditorWindow* editorWindow, TQWidget* parent = 0, const char* name = 0); virtual bool hasSelection() const; virtual void clearSelection(); diff --git a/kregexpeditor/qt-only/compat.cpp b/kregexpeditor/qt-only/compat.cpp index 528099e..a7a5d12 100644 --- a/kregexpeditor/qt-only/compat.cpp +++ b/kregexpeditor/qt-only/compat.cpp @@ -27,16 +27,16 @@ TQString i18n( const TQString& a, const TQString& b) { } KDialogBase::KDialogBase( int /*dialogFace*/, const TQString &caption, int buttonMask, - ButtonCode defaultButton, TQWidget *tqparent, const char *name, + ButtonCode defaultButton, TQWidget *parent, const char *name, bool modal ) - :TQDialog( tqparent, name, modal ) + :TQDialog( parent, name, modal ) { init( buttonMask, defaultButton, caption ); } -KDialogBase::KDialogBase( TQWidget* tqparent, const char* name, bool modal, +KDialogBase::KDialogBase( TQWidget* parent, const char* name, bool modal, const TQString& caption, int buttonMask ) - : TQDialog( tqparent, name, modal ) + : TQDialog( parent, name, modal ) { init( buttonMask, Ok, caption ); } @@ -92,24 +92,24 @@ void KDialogBase::slotCancel() emit finished(); } -int KMessageBox::warningYesNo(TQWidget *tqparent, const TQString &text, const TQString &caption ) +int KMessageBox::warningYesNo(TQWidget *parent, const TQString &text, const TQString &caption ) { - int code = warning( tqparent, caption, text, tr("No"), tr("Yes") ); + int code = warning( parent, caption, text, tr("No"), tr("Yes") ); if ( code == 0 ) return Yes; else return No; } -int KMessageBox::information( TQWidget* tqparent, const TQString& text, const TQString& caption, +int KMessageBox::information( TQWidget* parent, const TQString& text, const TQString& caption, const TQString& /*dontShowAgainName*/ ) { - return TQMessageBox::information( tqparent, caption, text ); + return TQMessageBox::information( parent, caption, text ); } -int KMessageBox::sorry( TQWidget* tqparent, const TQString& text, const TQString& caption ) +int KMessageBox::sorry( TQWidget* parent, const TQString& text, const TQString& caption ) { - return TQMessageBox::information( tqparent, caption, text ); + return TQMessageBox::information( parent, caption, text ); } diff --git a/kregexpeditor/qt-only/compat.h b/kregexpeditor/qt-only/compat.h index f09cbbf..cd3d10f 100644 --- a/kregexpeditor/qt-only/compat.h +++ b/kregexpeditor/qt-only/compat.h @@ -45,9 +45,9 @@ public: KDialogBase ( int dialogFace, const TQString &caption, int buttonMask, ButtonCode defaultButton, - TQWidget *tqparent=0, const char *name=0, bool modal=true ); + TQWidget *parent=0, const char *name=0, bool modal=true ); - KDialogBase( TQWidget* tqparent, const char* name = 0, bool modal = true, + KDialogBase( TQWidget* parent, const char* name = 0, bool modal = true, const TQString& caption = TQString(), int buttonMask = 0 ); @@ -76,11 +76,11 @@ class KMessageBox :public TQMessageBox TQ_OBJECT public: enum ButtonCode { Ok = 1, Cancel = 2, Yes = 3, No = 4, Continue = 5 }; - static int warningYesNo (TQWidget *tqparent, const TQString &text, + static int warningYesNo (TQWidget *parent, const TQString &text, const TQString &caption = TQString() ); - static int information( TQWidget* tqparent, const TQString& text, const TQString& caption = TQString(), + static int information( TQWidget* parent, const TQString& text, const TQString& caption = TQString(), const TQString& /*dontShowAgainName*/ = TQString() ); - static int sorry( TQWidget* tqparent, const TQString& text, const TQString& caption = TQString() ); + static int sorry( TQWidget* parent, const TQString& text, const TQString& caption = TQString() ); }; #endif /* COMPAT_H */ diff --git a/kregexpeditor/regexp.cpp b/kregexpeditor/regexp.cpp index c5961a3..cb94e84 100644 --- a/kregexpeditor/regexp.cpp +++ b/kregexpeditor/regexp.cpp @@ -49,9 +49,9 @@ void RegExp::removeChild( RegExp* child ) } } -void RegExp::setParent( RegExp* tqparent ) +void RegExp::setParent( RegExp* parent ) { - _parent = tqparent; + _parent = parent; } RegExp* RegExp::readRegExp( TQDomElement top, const TQString& version ) diff --git a/kregexpeditor/regexp.h b/kregexpeditor/regexp.h index ba828bb..9e0b384 100644 --- a/kregexpeditor/regexp.h +++ b/kregexpeditor/regexp.h @@ -44,7 +44,7 @@ public: void addChild( RegExp* child ); void removeChild( RegExp* child ); - void setParent( RegExp* tqparent ); + void setParent( RegExp* parent ); RegExp* clone() const; virtual bool operator==( const RegExp& other ) const { return ( type() == other.type() ); } diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp index f854f21..abbfb38 100644 --- a/kregexpeditor/regexpbuttons.cpp +++ b/kregexpeditor/regexpbuttons.cpp @@ -34,8 +34,8 @@ #include <tqsignalmapper.h> #include "regexpconverter.h" -RegExpButtons::RegExpButtons( TQWidget *tqparent, const char *name ) - : TQDockWindow( TQDockWindow::InDock, tqparent, name), _keepMode(false) +RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) + : TQDockWindow( TQDockWindow::InDock, parent, name), _keepMode(false) { TQBoxLayout *tqlayout = boxLayout(); diff --git a/kregexpeditor/regexpbuttons.h b/kregexpeditor/regexpbuttons.h index 6219422..5cdbba0 100644 --- a/kregexpeditor/regexpbuttons.h +++ b/kregexpeditor/regexpbuttons.h @@ -32,7 +32,7 @@ class RegExpButtons :public TQDockWindow TQ_OBJECT public: - RegExpButtons( TQWidget *tqparent, const char *name = 0 ); + RegExpButtons( TQWidget *parent, const char *name = 0 ); void setFeatures( int features ); protected: diff --git a/kregexpeditor/regexpwidget.cpp b/kregexpeditor/regexpwidget.cpp index 53e8540..c164c51 100644 --- a/kregexpeditor/regexpwidget.cpp +++ b/kregexpeditor/regexpwidget.cpp @@ -33,9 +33,9 @@ const int RegExpWidget::pw = 1; const int RegExpWidget::bdSize = 5; const int RegExpWidget::space = 5; -RegExpWidget::RegExpWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, +RegExpWidget::RegExpWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) - : TQWidget(tqparent, name ? name : "RegExpWidget", WNoMousePropagation ), + : TQWidget(parent, name ? name : "RegExpWidget", WNoMousePropagation ), _editorWindow( editorWindow ), _isSelected( false ), _isToplevel( false ) { } @@ -136,7 +136,7 @@ void RegExpWidget::mousePressEvent ( TQMouseEvent* event ) } // currently (TQt3.0) it seems like qt do not accept that the accept flag is set, - // and thus sends the event to the tqparent - given that the following line is in. + // and thus sends the event to the parent - given that the following line is in. // It doesn't make any change to leave it out. // 25 Oct. 2001 19:03 -- Jesper K. Pedersen // TQWidget::mousePressEvent( event ); diff --git a/kregexpeditor/regexpwidget.h b/kregexpeditor/regexpwidget.h index 0d65b8a..2fd455a 100644 --- a/kregexpeditor/regexpwidget.h +++ b/kregexpeditor/regexpwidget.h @@ -35,14 +35,14 @@ Q_OBJECT TQ_OBJECT public: - RegExpWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, + RegExpWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *label = 0); /*====================================================================== Construction, child management ======================================================================*/ /** - Add `child' to the tqparent of this widget in place of `accepter' + Add `child' to the parent of this widget in place of `accepter' This method only applies to container widgets (see @ref SingleContainerWidget, and @ref MultiContainerWidget). */ @@ -91,7 +91,7 @@ public: /** Update selection information for this widget. - @param parentSelected indicates whether the tqparent is selected. + @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. `tqrepaint' is invoked on the widget if selection state is changed, to ensure that selection is visible. diff --git a/kregexpeditor/repeatwidget.cpp b/kregexpeditor/repeatwidget.cpp index e284895..86f87f9 100644 --- a/kregexpeditor/repeatwidget.cpp +++ b/kregexpeditor/repeatwidget.cpp @@ -35,17 +35,17 @@ #include <tqvbuttongroup.h> #include "kwidgetstreamer.h" -RepeatWidget::RepeatWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, +RepeatWidget::RepeatWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) - : SingleContainerWidget(editorWindow, tqparent, name ? name : "RepeatWidget") + : SingleContainerWidget(editorWindow, parent, name ? name : "RepeatWidget") { _child = new ConcWidget(editorWindow, this); init(); } RepeatWidget::RepeatWidget( RepeatRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name ) - :SingleContainerWidget( editorWindow, tqparent, name ) + TQWidget* parent, const char* name ) + :SingleContainerWidget( editorWindow, parent, name ) { init(); RegExpWidget* child = WidgetFactory::createWidget( regexp->child(), editorWindow, this ); @@ -167,8 +167,8 @@ int RepeatWidget::edit() } //-------------------------------------------------------------------------------- -RepeatRangeWindow::RepeatRangeWindow( TQWidget* tqparent, const char* name ) - : TQVBox( tqparent, name ? name : "RepeatRangeWindow" ) +RepeatRangeWindow::RepeatRangeWindow( TQWidget* parent, const char* name ) + : TQVBox( parent, name ? name : "RepeatRangeWindow" ) { setSpacing( 6 ); @@ -218,14 +218,14 @@ RepeatRangeWindow::RepeatRangeWindow( TQWidget* tqparent, const char* name ) } -void RepeatRangeWindow::createLine( TQWidget* tqparent, TQString text, TQSpinBox** spin, REPEATTYPE tp ) +void RepeatRangeWindow::createLine( TQWidget* parent, TQString text, TQSpinBox** spin, REPEATTYPE tp ) { - TQRadioButton* radioBut = new TQRadioButton(text, tqparent); - *spin = new TQSpinBox( 1, 999, 1, tqparent); + TQRadioButton* radioBut = new TQRadioButton(text, parent); + *spin = new TQSpinBox( 1, 999, 1, parent); (*spin)->setValue(1); - (void) new TQLabel(i18n("time(s)"), tqparent); + (void) new TQLabel(i18n("time(s)"), parent); _group->insert(radioBut, tp); } diff --git a/kregexpeditor/repeatwidget.h b/kregexpeditor/repeatwidget.h index 14b3dec..8911461 100644 --- a/kregexpeditor/repeatwidget.h +++ b/kregexpeditor/repeatwidget.h @@ -38,7 +38,7 @@ Q_OBJECT public: enum REPEATTYPE {ANY, ATLEAST, ATMOST, EXACTLY, MINMAX}; - RepeatRangeWindow( TQWidget* tqparent, const char* name = 0 ); + RepeatRangeWindow( TQWidget* parent, const char* name = 0 ); TQString text(); int min(); int max(); @@ -51,7 +51,7 @@ protected slots: private: - void createLine( TQWidget* tqparent, TQString text, TQSpinBox** spin, REPEATTYPE tp ); + void createLine( TQWidget* parent, TQString text, TQSpinBox** spin, REPEATTYPE tp ); TQSpinBox* _leastTimes; TQSpinBox* _mostTimes; @@ -75,10 +75,10 @@ Q_OBJECT TQ_OBJECT public: - RepeatWidget( RegExpEditorWindow* editorWindow, TQWidget *tqparent, + RepeatWidget( RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name = 0); RepeatWidget( RepeatRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name = 0); + TQWidget* parent, const char* name = 0); void init(); virtual TQSize tqsizeHint() const; virtual RegExp* regExp() const; diff --git a/kregexpeditor/scrollededitorwindow.cpp b/kregexpeditor/scrollededitorwindow.cpp index cd88321..b14261c 100644 --- a/kregexpeditor/scrollededitorwindow.cpp +++ b/kregexpeditor/scrollededitorwindow.cpp @@ -22,8 +22,8 @@ #include "scrollededitorwindow.h" #include "editorwindow.h" -RegExpScrolledEditorWindow::RegExpScrolledEditorWindow( TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name) +RegExpScrolledEditorWindow::RegExpScrolledEditorWindow( TQWidget* parent, const char* name) + : TQWidget(parent, name) { _scrollView = new TQScrollView( this ); _editorWindow = new RegExpEditorWindow( _scrollView->viewport()); diff --git a/kregexpeditor/scrollededitorwindow.h b/kregexpeditor/scrollededitorwindow.h index e49940e..b404cee 100644 --- a/kregexpeditor/scrollededitorwindow.h +++ b/kregexpeditor/scrollededitorwindow.h @@ -32,7 +32,7 @@ class RegExpScrolledEditorWindow :public TQWidget Q_OBJECT TQ_OBJECT public: - RegExpScrolledEditorWindow( TQWidget *tqparent = 0, const char* name = 0); + RegExpScrolledEditorWindow( TQWidget *parent = 0, const char* name = 0); RegExp* regExp(); private: diff --git a/kregexpeditor/selectablelineedit.cpp b/kregexpeditor/selectablelineedit.cpp index c0344e2..ac42c83 100644 --- a/kregexpeditor/selectablelineedit.cpp +++ b/kregexpeditor/selectablelineedit.cpp @@ -22,8 +22,8 @@ #include "selectablelineedit.h" -SelectableLineEdit::SelectableLineEdit( RegExpWidget* owner, TQWidget* tqparent, const char* name) - : TQLineEdit( tqparent, name ), _owner(owner) +SelectableLineEdit::SelectableLineEdit( RegExpWidget* owner, TQWidget* parent, const char* name) + : TQLineEdit( parent, name ), _owner(owner) { connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotKeyPressed() ) ); diff --git a/kregexpeditor/selectablelineedit.h b/kregexpeditor/selectablelineedit.h index 068aabc..7fb7ad7 100644 --- a/kregexpeditor/selectablelineedit.h +++ b/kregexpeditor/selectablelineedit.h @@ -37,7 +37,7 @@ Q_OBJECT TQ_OBJECT public: - SelectableLineEdit( RegExpWidget* owner, TQWidget* tqparent = 0, const char* name = 0); + SelectableLineEdit( RegExpWidget* owner, TQWidget* parent = 0, const char* name = 0); void setSelected( bool selected ); virtual TQSize tqsizeHint() const; diff --git a/kregexpeditor/singlecontainerwidget.cpp b/kregexpeditor/singlecontainerwidget.cpp index bfa90b9..2413236 100644 --- a/kregexpeditor/singlecontainerwidget.cpp +++ b/kregexpeditor/singlecontainerwidget.cpp @@ -23,8 +23,8 @@ #include "concwidget.h" SingleContainerWidget::SingleContainerWidget(RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name) - : RegExpWidget( editorWindow, tqparent, name ) + TQWidget* parent, const char* name) + : RegExpWidget( editorWindow, parent, name ) { } diff --git a/kregexpeditor/singlecontainerwidget.h b/kregexpeditor/singlecontainerwidget.h index 9b61ecf..3e6768a 100644 --- a/kregexpeditor/singlecontainerwidget.h +++ b/kregexpeditor/singlecontainerwidget.h @@ -28,7 +28,7 @@ Q_OBJECT TQ_OBJECT public: - SingleContainerWidget( RegExpEditorWindow* editorWindow, TQWidget* tqparent, + SingleContainerWidget( RegExpEditorWindow* editorWindow, TQWidget* parent, const char* name = 0); virtual bool updateSelection( bool parentSelected ); diff --git a/kregexpeditor/textwidget.cpp b/kregexpeditor/textwidget.cpp index 1095749..99a77e1 100644 --- a/kregexpeditor/textwidget.cpp +++ b/kregexpeditor/textwidget.cpp @@ -24,16 +24,16 @@ #include "selectablelineedit.h" #include <tqlayout.h> -TextWidget::TextWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, +TextWidget::TextWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) - :RegExpWidget(editorWindow, tqparent, name) + :RegExpWidget(editorWindow, parent, name) { init( TQString::fromLocal8Bit("") ); } TextWidget::TextWidget( TextRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name ) - : RegExpWidget( editorWindow, tqparent, name ) + TQWidget* parent, const char* name ) + : RegExpWidget( editorWindow, parent, name ) { init(regexp->text()); } @@ -56,11 +56,11 @@ void TextWidget::init( const TQString& txt ) void TextWidget::slotUpdate() { - // I need to force the tqparent to tqrepaint, as the size change of this - // widget may not be enough for the tqparent to change size, and in that - // case the tqparent would not tqrepaint, and the text widget would not be + // 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 tqrepaint, and the text widget would not be // resized. - TQWidget *p = TQT_TQWIDGET(tqparent()); + TQWidget *p = TQT_TQWIDGET(parent()); if (p) p->tqrepaint(); _editorWindow->updateContent( this ); diff --git a/kregexpeditor/textwidget.h b/kregexpeditor/textwidget.h index 1520808..71ccf9b 100644 --- a/kregexpeditor/textwidget.h +++ b/kregexpeditor/textwidget.h @@ -33,10 +33,10 @@ class TextWidget : public RegExpWidget TQ_OBJECT public: - TextWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, + TextWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name = 0); TextWidget( TextRegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent, const char* name = 0); + TQWidget* parent, const char* name = 0); virtual TQSize tqsizeHint() const; virtual RegExp* regExp() const; virtual RegExpType type() const { return TEXT; } diff --git a/kregexpeditor/userdefinedregexps.cpp b/kregexpeditor/userdefinedregexps.cpp index 723e81f..85dc96e 100644 --- a/kregexpeditor/userdefinedregexps.cpp +++ b/kregexpeditor/userdefinedregexps.cpp @@ -35,8 +35,8 @@ #include <tqlayout.h> #include <tqlabel.h> -UserDefinedRegExps::UserDefinedRegExps( TQWidget *tqparent, const char *name ) - : TQDockWindow( TQDockWindow::InDock, tqparent, name) +UserDefinedRegExps::UserDefinedRegExps( TQWidget *parent, const char *name ) + : TQDockWindow( TQDockWindow::InDock, parent, name) { TQWidget* top = new TQWidget( this ); TQVBoxLayout* lay = new TQVBoxLayout( top, 6 ); @@ -223,8 +223,8 @@ void UserDefinedRegExps::slotSelectNewAction() slotUnSelect(); } -WidgetWinItem::WidgetWinItem( TQString fileName, RegExp* regexp, bool usersRegExp, TQListViewItem* tqparent ) - :TQListViewItem( tqparent ), _regexp( regexp ), _usersRegExp ( usersRegExp ) +WidgetWinItem::WidgetWinItem( TQString fileName, RegExp* regexp, bool usersRegExp, TQListViewItem* parent ) + :TQListViewItem( parent ), _regexp( regexp ), _usersRegExp ( usersRegExp ) { int index = fileName.findRev(TQString::fromLocal8Bit(".regexp")); _name = fileName.left(index); diff --git a/kregexpeditor/userdefinedregexps.h b/kregexpeditor/userdefinedregexps.h index e6062ca..0b01b81 100644 --- a/kregexpeditor/userdefinedregexps.h +++ b/kregexpeditor/userdefinedregexps.h @@ -31,7 +31,7 @@ Q_OBJECT TQ_OBJECT public: - UserDefinedRegExps( TQWidget *tqparent, const char *name = 0 ); + UserDefinedRegExps( TQWidget *parent, const char *name = 0 ); const TQPtrList<CompoundRegExp> regExps() const; public slots: @@ -57,7 +57,7 @@ private: class WidgetWinItem :public TQListViewItem { public: - WidgetWinItem( TQString name, RegExp* regexp, bool users, TQListViewItem* tqparent ); + WidgetWinItem( TQString name, RegExp* regexp, bool users, TQListViewItem* parent ); static TQString path(); TQString fileName() const; diff --git a/kregexpeditor/verifier.cpp b/kregexpeditor/verifier.cpp index 00b75be..18e1be3 100644 --- a/kregexpeditor/verifier.cpp +++ b/kregexpeditor/verifier.cpp @@ -24,7 +24,7 @@ #include "verifier.h" -Verifier::Verifier( TQWidget* tqparent, const char* name ) : TQTextEdit( tqparent, name ) +Verifier::Verifier( TQWidget* parent, const char* name ) : TQTextEdit( parent, name ) /* TQT_ANCHOR_DO_NOT_WORK: ,_current( 0 ) */ { _highlighter = 0; diff --git a/kregexpeditor/verifier.h b/kregexpeditor/verifier.h index 4d204de..d1999d6 100644 --- a/kregexpeditor/verifier.h +++ b/kregexpeditor/verifier.h @@ -28,7 +28,7 @@ class Verifier :public TQTextEdit Q_OBJECT TQ_OBJECT public: - Verifier( TQWidget* tqparent, const char* name = 0 ); + Verifier( TQWidget* parent, const char* name = 0 ); void setHighlighter( RegexpHighlighter* ); public slots: diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp index 05b0fb7..675d3e6 100644 --- a/kregexpeditor/verifybuttons.cpp +++ b/kregexpeditor/verifybuttons.cpp @@ -39,8 +39,8 @@ #include <tqpopupmenu.h> #include <tqaction.h> -VerifyButtons::VerifyButtons( TQWidget* tqparent, const char* name ) - :TQDockWindow( TQDockWindow::InDock, tqparent, name ), _configMenu( 0 ) +VerifyButtons::VerifyButtons( TQWidget* parent, const char* name ) + :TQDockWindow( TQDockWindow::InDock, parent, name ), _configMenu( 0 ) { TQBoxLayout* tqlayout = boxLayout(); diff --git a/kregexpeditor/verifybuttons.h b/kregexpeditor/verifybuttons.h index 1298573..90629c0 100644 --- a/kregexpeditor/verifybuttons.h +++ b/kregexpeditor/verifybuttons.h @@ -31,7 +31,7 @@ class VerifyButtons :public TQDockWindow TQ_OBJECT public: - VerifyButtons( TQWidget* tqparent, const char* name ); + VerifyButtons( TQWidget* parent, const char* name ); RegExpConverter* setSyntax( const TQString& ); void setAllowNonTQtSyntax( bool ); diff --git a/kregexpeditor/widgetfactory.cpp b/kregexpeditor/widgetfactory.cpp index 4bbc2b9..9f167b2 100644 --- a/kregexpeditor/widgetfactory.cpp +++ b/kregexpeditor/widgetfactory.cpp @@ -46,35 +46,35 @@ bool WidgetFactory::isContainer( RegExpType tp ) return ( tp == REPEAT || tp == ALTN || tp == COMPOUND ); } -RegExpWidget* WidgetFactory::createWidget( RegExpEditorWindow* win, TQWidget* tqparent, +RegExpWidget* WidgetFactory::createWidget( RegExpEditorWindow* win, TQWidget* parent, RegExpType type ) { RegExpWidget* widget = 0; switch (type) { case TEXT: - return new TextWidget( win, tqparent ); break; + return new TextWidget( win, parent ); break; case ALTN: - return new AltnWidget( win, tqparent ); break; + return new AltnWidget( win, parent ); break; case DOT: - return new AnyCharWidget( win, tqparent ); break; + return new AnyCharWidget( win, parent ); break; case BEGLINE: - return new BegLineWidget( win, tqparent ); break; + return new BegLineWidget( win, parent ); break; case ENDLINE: - return new EndLineWidget( win, tqparent ); break; + return new EndLineWidget( win, parent ); break; case WORDBOUNDARY: - return new WordBoundaryWidget( win, tqparent ); break; + return new WordBoundaryWidget( win, parent ); break; case NONWORDBOUNDARY: - return new NonWordBoundaryWidget( win, tqparent ); break; + return new NonWordBoundaryWidget( win, parent ); break; case POSLOOKAHEAD: case NEGLOOKAHEAD: - return new LookAheadWidget( win, type, tqparent ); break; + return new LookAheadWidget( win, type, parent ); break; case REPEAT: - widget = new RepeatWidget( win, tqparent ); break; + widget = new RepeatWidget( win, parent ); break; case CHARSET: - widget = new CharactersWidget( win, tqparent ); break; + widget = new CharactersWidget( win, parent ); break; case COMPOUND: - widget = new CompoundWidget( win, tqparent ); break; + widget = new CompoundWidget( win, parent ); break; default: qFatal("It should not be possible to get here!"); return 0; @@ -88,43 +88,43 @@ RegExpWidget* WidgetFactory::createWidget( RegExpEditorWindow* win, TQWidget* tq } RegExpWidget* WidgetFactory::createWidget( RegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent ) + TQWidget* parent ) { if ( regexp == 0 ) { qFatal("%s:%d Regexp is 0", __FILE__, __LINE__ ); } else if ( TextRegExp* reg = dynamic_cast<TextRegExp*>( regexp ) ) - return new TextWidget( reg, editorWindow, tqparent ); + return new TextWidget( reg, editorWindow, parent ); else if ( TextRangeRegExp* reg = dynamic_cast<TextRangeRegExp*>( regexp ) ) - return new CharactersWidget( reg, editorWindow, tqparent ); + return new CharactersWidget( reg, editorWindow, parent ); else if ( RepeatRegExp* reg = dynamic_cast<RepeatRegExp*>( regexp ) ) - return new RepeatWidget( reg, editorWindow, tqparent ); + return new RepeatWidget( reg, editorWindow, parent ); else if ( LookAheadRegExp* reg = dynamic_cast<LookAheadRegExp*>( regexp ) ) { if ( reg->lookAheadType() == LookAheadRegExp::POSITIVE ) - return new LookAheadWidget( reg, editorWindow, POSLOOKAHEAD, tqparent ); + return new LookAheadWidget( reg, editorWindow, POSLOOKAHEAD, parent ); else - return new LookAheadWidget( reg, editorWindow, NEGLOOKAHEAD, tqparent ); + return new LookAheadWidget( reg, editorWindow, NEGLOOKAHEAD, parent ); } else if ( ConcRegExp* reg = dynamic_cast<ConcRegExp*>( regexp ) ) - return new ConcWidget( reg, editorWindow, tqparent ); + return new ConcWidget( reg, editorWindow, parent ); else if ( AltnRegExp* reg = dynamic_cast<AltnRegExp*>( regexp ) ) - return new AltnWidget( reg, editorWindow, tqparent ); + return new AltnWidget( reg, editorWindow, parent ); else if ( PositionRegExp* reg = dynamic_cast<PositionRegExp*>( regexp ) ) { switch ( reg->position() ) { case PositionRegExp::BEGLINE: - return new BegLineWidget( editorWindow, tqparent ); + return new BegLineWidget( editorWindow, parent ); case PositionRegExp::ENDLINE: - return new EndLineWidget( editorWindow, tqparent ); + return new EndLineWidget( editorWindow, parent ); case PositionRegExp::WORDBOUNDARY: - return new WordBoundaryWidget( editorWindow, tqparent ); + return new WordBoundaryWidget( editorWindow, parent ); case PositionRegExp::NONWORDBOUNDARY: - return new NonWordBoundaryWidget( editorWindow, tqparent ); + return new NonWordBoundaryWidget( editorWindow, parent ); } } else if ( dynamic_cast<DotRegExp*>( regexp ) ) - return new AnyCharWidget( editorWindow, tqparent ); + return new AnyCharWidget( editorWindow, parent ); else if ( CompoundRegExp* reg = dynamic_cast<CompoundRegExp*>( regexp ) ) - return new CompoundWidget( reg, editorWindow, tqparent ); + return new CompoundWidget( reg, editorWindow, parent ); else { qFatal("%s:%d Internal Error: Unknown RegExp type", __FILE__, __LINE__); } diff --git a/kregexpeditor/widgetfactory.h b/kregexpeditor/widgetfactory.h index 836ee12..2ef7233 100644 --- a/kregexpeditor/widgetfactory.h +++ b/kregexpeditor/widgetfactory.h @@ -47,10 +47,10 @@ enum RegExpType { class WidgetFactory { public: - static RegExpWidget* createWidget( RegExpEditorWindow* editorWindow, TQWidget* tqparent, + static RegExpWidget* createWidget( RegExpEditorWindow* editorWindow, TQWidget* parent, RegExpType type ); static RegExpWidget* createWidget( RegExp* regexp, RegExpEditorWindow* editorWindow, - TQWidget* tqparent ); + TQWidget* parent ); static RegExp* createRegExp( TQDomElement node, const TQString& version ); static RegExp* createRegExp( TQString str ); static bool isContainer( RegExpType ); diff --git a/kregexpeditor/zerowidgets.cpp b/kregexpeditor/zerowidgets.cpp index ede99cb..eaf1aaf 100644 --- a/kregexpeditor/zerowidgets.cpp +++ b/kregexpeditor/zerowidgets.cpp @@ -31,8 +31,8 @@ // ZeroWidget //-------------------------------------------------------------------------------- ZeroWidget::ZeroWidget(TQString txt, RegExpEditorWindow* editorWindow, - TQWidget *tqparent, const char *name) - : RegExpWidget(editorWindow, tqparent, name ? name : "ZeroWidget" ) + TQWidget *parent, const char *name) + : RegExpWidget(editorWindow, parent, name ? name : "ZeroWidget" ) { _text = txt; } @@ -70,9 +70,9 @@ void ZeroWidget::paintEvent( TQPaintEvent *e) //-------------------------------------------------------------------------------- // AnyCharWidget //-------------------------------------------------------------------------------- -AnyCharWidget::AnyCharWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, +AnyCharWidget::AnyCharWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) - : ZeroWidget(i18n("Any\nCharacter"), editorWindow, tqparent, + : ZeroWidget(i18n("Any\nCharacter"), editorWindow, parent, name ? name : "AnyCharWidget") { } @@ -86,9 +86,9 @@ RegExp* AnyCharWidget::regExp() const //-------------------------------------------------------------------------------- // BegLineWidget //-------------------------------------------------------------------------------- -BegLineWidget::BegLineWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, +BegLineWidget::BegLineWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) - : ZeroWidget(i18n("Line\nStart"), editorWindow, tqparent, + : ZeroWidget(i18n("Line\nStart"), editorWindow, parent, name ? name : "BegLineWidget") { } @@ -102,9 +102,9 @@ RegExp* BegLineWidget::regExp() const //-------------------------------------------------------------------------------- // EndLineWidget //-------------------------------------------------------------------------------- -EndLineWidget::EndLineWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, +EndLineWidget::EndLineWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) - : ZeroWidget(i18n("Line\nEnd"), editorWindow, tqparent, name) + : ZeroWidget(i18n("Line\nEnd"), editorWindow, parent, name) { } @@ -116,9 +116,9 @@ RegExp* EndLineWidget::regExp() const //-------------------------------------------------------------------------------- // WordBoundaryWidget //-------------------------------------------------------------------------------- -WordBoundaryWidget::WordBoundaryWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, +WordBoundaryWidget::WordBoundaryWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) - : ZeroWidget(i18n("Word\nBoundary"), editorWindow, tqparent, + : ZeroWidget(i18n("Word\nBoundary"), editorWindow, parent, name ? name : "WordBoundaryWidget" ) { } @@ -131,9 +131,9 @@ RegExp* WordBoundaryWidget::regExp() const //-------------------------------------------------------------------------------- // NonWordBoundaryWidget //-------------------------------------------------------------------------------- -NonWordBoundaryWidget::NonWordBoundaryWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, +NonWordBoundaryWidget::NonWordBoundaryWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name) - : ZeroWidget(i18n("Non-word\nBoundary"), editorWindow, tqparent, + : ZeroWidget(i18n("Non-word\nBoundary"), editorWindow, parent, name ? name : "NonWordBoundaryWidget" ) { } diff --git a/kregexpeditor/zerowidgets.h b/kregexpeditor/zerowidgets.h index f418988..780f426 100644 --- a/kregexpeditor/zerowidgets.h +++ b/kregexpeditor/zerowidgets.h @@ -27,7 +27,7 @@ class ZeroWidget :public RegExpWidget { public: - ZeroWidget(TQString text, RegExpEditorWindow* editorWindow, TQWidget *tqparent, + ZeroWidget(TQString text, RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name = 0); virtual void addNewChild(DragAccepter *accepter, RegExpWidget *child); virtual TQSize tqsizeHint() const; @@ -51,7 +51,7 @@ private: class AnyCharWidget :public ZeroWidget { public: - AnyCharWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, + AnyCharWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *label = 0); virtual RegExp* regExp() const; @@ -68,7 +68,7 @@ public: class BegLineWidget : public ZeroWidget { public: - BegLineWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, + BegLineWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name = 0); virtual RegExp* regExp() const; virtual RegExpType type() const { return BEGLINE; } @@ -84,7 +84,7 @@ public: class EndLineWidget : public ZeroWidget { public: - EndLineWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, + EndLineWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name = 0); virtual RegExp* regExp() const; virtual RegExpType type() const { return ENDLINE; } @@ -99,7 +99,7 @@ public: class WordBoundaryWidget : public ZeroWidget { public: - WordBoundaryWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, + WordBoundaryWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name = 0); virtual RegExp* regExp() const; virtual RegExpType type() const { return WORDBOUNDARY; } @@ -115,7 +115,7 @@ public: class NonWordBoundaryWidget : public ZeroWidget { public: - NonWordBoundaryWidget(RegExpEditorWindow* editorWindow, TQWidget *tqparent, + NonWordBoundaryWidget(RegExpEditorWindow* editorWindow, TQWidget *parent, const char *name = 0); virtual RegExp* regExp() const; virtual RegExpType type() const { return NONWORDBOUNDARY; } diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp index f335d0f..3727b1f 100644 --- a/ksim/generalprefs.cpp +++ b/ksim/generalprefs.cpp @@ -40,8 +40,8 @@ #include <ksimconfig.h> -KSim::GeneralPrefs::GeneralPrefs(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_mainLayout = new TQGridLayout(this); m_mainLayout->setSpacing(6); @@ -122,8 +122,8 @@ void KSim::GeneralPrefs::readConfig(KSim::Config *config) m_recolourThemes->setChecked(config->reColourThemes()); } -KSim::ClockPrefs::ClockPrefs(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KSim::ClockPrefs::ClockPrefs(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_mainLayout = new TQVBoxLayout(this); m_mainLayout->setSpacing(6); @@ -157,8 +157,8 @@ void KSim::ClockPrefs::readConfig(KSim::Config *config) m_dateCheck->setChecked(config->showDate()); } -KSim::UptimePrefs::UptimePrefs(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_addIcon = SmallIconSet("filenew"); m_removeIcon = SmallIconSet("editdelete"); @@ -294,8 +294,8 @@ void KSim::UptimePrefs::removeUptimeItem() m_uptimeCombo->setCurrentItem(currentItem - 1); } -KSim::MemoryPrefs::MemoryPrefs(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_addIcon = SmallIconSet("filenew"); m_removeIcon = SmallIconSet("editdelete"); @@ -442,8 +442,8 @@ void KSim::MemoryPrefs::removeMemoryItem() m_memCombo->setCurrentItem(currentItem - 1); } -KSim::SwapPrefs::SwapPrefs(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_addIcon = SmallIconSet("filenew"); m_removeIcon = SmallIconSet("editdelete"); diff --git a/ksim/generalprefs.h b/ksim/generalprefs.h index ae77882..776348a 100644 --- a/ksim/generalprefs.h +++ b/ksim/generalprefs.h @@ -45,7 +45,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - GeneralPrefs(TQWidget *tqparent, const char *name=0); + GeneralPrefs(TQWidget *parent, const char *name=0); ~GeneralPrefs(); public slots: @@ -68,7 +68,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - ClockPrefs(TQWidget *tqparent, const char *name=0); + ClockPrefs(TQWidget *parent, const char *name=0); ~ClockPrefs(); public slots: @@ -86,7 +86,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - UptimePrefs(TQWidget *tqparent, const char *name=0); + UptimePrefs(TQWidget *parent, const char *name=0); ~UptimePrefs(); public slots: @@ -121,7 +121,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - MemoryPrefs(TQWidget *tqparent, const char *name=0); + MemoryPrefs(TQWidget *parent, const char *name=0); ~MemoryPrefs(); public slots: @@ -158,7 +158,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - SwapPrefs(TQWidget *tqparent, const char *name=0); + SwapPrefs(TQWidget *parent, const char *name=0); ~SwapPrefs(); public slots: diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp index 24e39f7..2e2587e 100644 --- a/ksim/ksim.cpp +++ b/ksim/ksim.cpp @@ -35,19 +35,19 @@ extern "C" { - KDE_EXPORT KPanelExtension *init(TQWidget *tqparent, const TQString &configFile) + KDE_EXPORT KPanelExtension *init(TQWidget *parent, const TQString &configFile) { KGlobal::locale()->insertCatalogue("ksim"); return new KSim::PanelExtension(configFile, KPanelExtension::Normal, KPanelExtension::About | KPanelExtension::Help | KPanelExtension::Preferences | KPanelExtension::ReportBug, - tqparent, "ksim"); + parent, "ksim"); } } KSim::PanelExtension::PanelExtension(const TQString &configFile, - Type type, int actions, TQWidget *tqparent, const char *name) - : KPanelExtension(configFile, type, actions, tqparent, name) + Type type, int actions, TQWidget *parent, const char *name) + : KPanelExtension(configFile, type, actions, parent, name) { m_dcopClient = new DCOPClient; m_view = new KSim::MainView(config(), true, this, "m_view"); diff --git a/ksim/ksim.h b/ksim/ksim.h index e74e068..2c1a4f5 100644 --- a/ksim/ksim.h +++ b/ksim/ksim.h @@ -38,7 +38,7 @@ namespace KSim TQ_OBJECT public: PanelExtension( const TQString & configFile, Type type, - int actions, TQWidget * tqparent, const char * name); + int actions, TQWidget * parent, const char * name); ~PanelExtension(); diff --git a/ksim/ksimframe.cpp b/ksim/ksimframe.cpp index 80af61a..a76eddf 100644 --- a/ksim/ksimframe.cpp +++ b/ksim/ksimframe.cpp @@ -23,8 +23,8 @@ #include "ksim.h" #include "themetypes.h" -KSim::Frame::Frame(int type, TQWidget *tqparent, const char *name) - : TQWidget (tqparent, name) +KSim::Frame::Frame(int type, TQWidget *parent, const char *name) + : TQWidget (parent, name) { setType(type); diff --git a/ksim/ksimframe.h b/ksim/ksimframe.h index 976523f..d793a3a 100644 --- a/ksim/ksimframe.h +++ b/ksim/ksimframe.h @@ -36,7 +36,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - Frame(int type, TQWidget *tqparent, const char *name = 0); + Frame(int type, TQWidget *parent, const char *name = 0); ~Frame(); const TQPixmap *const background() const { return &m_background; } diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp index b379540..e5bb44a 100644 --- a/ksim/ksimpref.cpp +++ b/ksim/ksimpref.cpp @@ -37,9 +37,9 @@ #include <tqframe.h> KSim::ConfigDialog::ConfigDialog(KSim::Config *config, - TQWidget *tqparent, const char *name) + TQWidget *parent, const char *name) : KDialogBase(TreeList, i18n("Configure"), - Help | Ok | Apply | Close, Ok, tqparent, name, true, true) + Help | Ok | Apply | Close, Ok, parent, name, true, true) { resize(466, 363); setShowIconsInTreeList(true); @@ -93,7 +93,7 @@ KSim::ConfigDialog::ConfigDialog(KSim::Config *config, connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(savePrefs())); connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(closePrefs())); connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(loadPluginConfig())); - connect(tqparent, TQT_SIGNAL(reload()), TQT_SLOT(reload())); + connect(parent, TQT_SIGNAL(reload()), TQT_SLOT(reload())); KSim::PluginList::ConstIterator it; const KSim::PluginList &pluginList = KSim::PluginLoader::self().pluginList(); @@ -127,7 +127,7 @@ void KSim::ConfigDialog::removePage(const TQCString &name) } TQWidget *frame = plugin.configPage()->parentWidget(); - // reparent the widget if the tqparent is not null + // reparent the widget if the parent is not null if (frame) { plugin.configPage()->hide(); plugin.configPage()->reparent(0, TQPoint(0, 0), false); diff --git a/ksim/ksimpref.h b/ksim/ksimpref.h index 4175ca5..6118adf 100644 --- a/ksim/ksimpref.h +++ b/ksim/ksimpref.h @@ -75,7 +75,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - ConfigDialog(KSim::Config *config, TQWidget *tqparent, const char *name = 0); + ConfigDialog(KSim::Config *config, TQWidget *parent, const char *name = 0); ~ConfigDialog(); public slots: diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp index 259ef51..6813aeb 100644 --- a/ksim/ksimsysinfo.cpp +++ b/ksim/ksimsysinfo.cpp @@ -41,8 +41,8 @@ #include <string.h> KSim::Sysinfo::Sysinfo(KSim::Config *config, - TQWidget *tqparent, const char *name, WFlags fl) - : DCOPObject("sysinfo"), TQWidget(tqparent, name, fl) + TQWidget *parent, const char *name, WFlags fl) + : DCOPObject("sysinfo"), TQWidget(parent, name, fl) { m_config = config; m_layout = new TQVBoxLayout(this); diff --git a/ksim/ksimsysinfo.h b/ksim/ksimsysinfo.h index 2844a00..c0d1511 100644 --- a/ksim/ksimsysinfo.h +++ b/ksim/ksimsysinfo.h @@ -37,7 +37,7 @@ namespace KSim // TQ_OBJECT K_DCOP public: - Sysinfo(KSim::Config *config, TQWidget *tqparent=0, + Sysinfo(KSim::Config *config, TQWidget *parent=0, const char *name=0, WFlags fl=0); ~Sysinfo(); diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp index e84ad7c..0315cd1 100644 --- a/ksim/ksimview.cpp +++ b/ksim/ksimview.cpp @@ -212,19 +212,19 @@ void KSim::MainView::slotMaskMainView() void KSim::MainView::maskMainView() { - if (!m_topFrame->background()->tqmask() || - !m_leftFrame->background()->tqmask() || - !m_rightFrame->background()->tqmask() || - !m_bottomFrame->background()->tqmask()) + if (!m_topFrame->background()->mask() || + !m_leftFrame->background()->mask() || + !m_rightFrame->background()->mask() || + !m_bottomFrame->background()->mask()) { tqtopLevelWidget()->clearMask(); return; } - TQBitmap topPixmap(*m_topFrame->background()->tqmask()); - TQBitmap leftPixmap(*m_leftFrame->background()->tqmask()); - TQBitmap rightPixmap(*m_rightFrame->background()->tqmask()); - TQBitmap bottomPixmap(*m_bottomFrame->background()->tqmask()); + TQBitmap topPixmap(*m_topFrame->background()->mask()); + TQBitmap leftPixmap(*m_leftFrame->background()->mask()); + TQBitmap rightPixmap(*m_rightFrame->background()->mask()); + TQBitmap bottomPixmap(*m_bottomFrame->background()->mask()); TQSize insideSize(m_pluginLayout->tqgeometry().size()); diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp index b90fe00..ca555a4 100644 --- a/ksim/library/chart.cpp +++ b/ksim/library/chart.cpp @@ -107,15 +107,15 @@ class KSim::Chart::Private }; KSim::Chart::Chart(bool showKrell, int maxValue, - const TQString &title, TQWidget *tqparent, const char *name, - WFlags fl) : TQWidget(tqparent, name, fl) + const TQString &title, TQWidget *parent, const char *name, + WFlags fl) : TQWidget(parent, name, fl) { init(showKrell, maxValue, title); } KSim::Chart::Chart(bool showKrell, int maxValue, - TQWidget *tqparent, const char *name, WFlags fl) - : TQWidget(tqparent, name, fl) + TQWidget *parent, const char *name, WFlags fl) + : TQWidget(parent, name, fl) { init(showKrell, maxValue, i18n("None")); } diff --git a/ksim/library/chart.h b/ksim/library/chart.h index 2354e22..cd658c0 100644 --- a/ksim/library/chart.h +++ b/ksim/library/chart.h @@ -47,10 +47,10 @@ namespace KSim * @param minValue is the minimum value to show * @param maxValue is the maximum value to show * @param title is the title off the krell bar (if enabled) - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ Chart(bool displayMeter, int maxValue, - const TQString &title, TQWidget *tqparent, + const TQString &title, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * Constructs a KSim::Chart. @@ -58,10 +58,10 @@ namespace KSim * @param showKrell is if the krellbar should be shown * @param minValue is the minimum value to show * @param maxValue is the maximum value to show - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ Chart(bool displayMeter, int maxValue, - TQWidget *tqparent, const char *name = 0, + TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * destructs KSim::Chart diff --git a/ksim/library/common.h b/ksim/library/common.h index c64504b..9fc01c0 100644 --- a/ksim/library/common.h +++ b/ksim/library/common.h @@ -58,7 +58,7 @@ namespace KSim * class Test : public TQWidget, virtual public KSim::Base * { * public: - * Test(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) + * Test(TQWidget *parent, const char *name) : TQWidget(parent, name) * { * } * ~Test() {} diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp index 37b86b3..0b9ed18 100644 --- a/ksim/library/label.cpp +++ b/ksim/library/label.cpp @@ -50,20 +50,20 @@ class KSim::Label::Private bool showShadow; }; -KSim::Label::Label(TQWidget *tqparent, const char *name, WFlags fl) - : TQWidget(tqparent, name, fl) +KSim::Label::Label(TQWidget *parent, const char *name, WFlags fl) + : TQWidget(parent, name, fl) { initWidget(KSim::Types::None); } -KSim::Label::Label(int type, TQWidget *tqparent, const char *name, - WFlags fl) : TQWidget(tqparent, name, fl) +KSim::Label::Label(int type, TQWidget *parent, const char *name, + WFlags fl) : TQWidget(parent, name, fl) { initWidget(type); } -KSim::Label::Label(int type, const TQString &text, TQWidget *tqparent, - const char *name, WFlags fl) : TQWidget(tqparent, name, fl) +KSim::Label::Label(int type, const TQString &text, TQWidget *parent, + const char *name, WFlags fl) : TQWidget(parent, name, fl) { initWidget(type); setText(text); diff --git a/ksim/library/label.h b/ksim/library/label.h index a888d89..f20d8df 100644 --- a/ksim/library/label.h +++ b/ksim/library/label.h @@ -42,7 +42,7 @@ namespace KSim /** * Constructs a KSim::Label. * - * @param tqparent is the tqparent widget + * @param parent is the parent widget * * Example usage: * <pre> @@ -51,12 +51,12 @@ namespace KSim * To create a KSim::Label with the normal theme look * @see KSim::ThemeLoader */ - Label(TQWidget *tqparent, const char *name = 0, WFlags fl = 0); + Label(TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * Constructs a KSimLabel. * * @param type is the theme type - * @param tqparent is the tqparent widget + * @param parent is the parent widget * * Example usage: * <pre> @@ -66,13 +66,13 @@ namespace KSim * NOTE: this is the same as the KSim::Label(TQWidget *, const char *, WFlags) ctor * @see KSim::ThemeLoader */ - Label(int type, TQWidget *tqparent, const char *name = 0, WFlags fl = 0); + Label(int type, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * Constructs a KSim::Label. * * @param type is the theme type * @param text is the default text to display - * @param tqparent is the tqparent widget + * @param parent is the parent widget * * Example usage: * <pre> @@ -82,7 +82,7 @@ namespace KSim * @see KSim::ThemeLoader */ Label(int type, const TQString &text, - TQWidget *tqparent, const char *name = 0, WFlags fl = 0); + TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * destructs KSim::Label. */ diff --git a/ksim/library/led.cpp b/ksim/library/led.cpp index f2acc2b..3fa8d7f 100644 --- a/ksim/library/led.cpp +++ b/ksim/library/led.cpp @@ -81,10 +81,10 @@ void KSim::Led::setOn(bool force) return; } - if (d->pixmap.tqmask() && !d->pixmap.tqmask()->isNull()) { - TQBitmap tqmask(rect.size()); - bitBlt(&tqmask, TQPoint(0, 0), d->pixmap.tqmask(), rect, CopyROP); - setMask(tqmask); + if (d->pixmap.mask() && !d->pixmap.mask()->isNull()) { + TQBitmap mask(rect.size()); + bitBlt(&mask, TQPoint(0, 0), d->pixmap.mask(), rect, CopyROP); + setMask(mask); } bitBlt(this, TQPoint(0, 0), &d->pixmap, rect, CopyROP); @@ -104,10 +104,10 @@ void KSim::Led::setOff(bool force) return; } - if (d->pixmap.tqmask() && !d->pixmap.tqmask()->isNull()) { - TQBitmap tqmask(rect.size()); - bitBlt(&tqmask, TQPoint(0, 0), d->pixmap.tqmask(), rect, CopyROP); - setMask(tqmask); + if (d->pixmap.mask() && !d->pixmap.mask()->isNull()) { + TQBitmap mask(rect.size()); + bitBlt(&mask, TQPoint(0, 0), d->pixmap.mask(), rect, CopyROP); + setMask(mask); } bitBlt(this, TQPoint(0, 0), &d->pixmap, rect, CopyROP); @@ -184,24 +184,24 @@ class KSim::LedLabel::Private }; KSim::LedLabel::LedLabel(int max, int type, const TQString &label, - TQWidget *tqparent, const char *name, WFlags fl) - : KSim::Progress(max, type, Panel, tqparent, name, fl) + TQWidget *parent, const char *name, WFlags fl) + : KSim::Progress(max, type, Panel, parent, name, fl) { init(); setText(label); } KSim::LedLabel::LedLabel(int max, int type, - TQWidget *tqparent, const char *name, WFlags fl) - : KSim::Progress(max, type, Panel, tqparent, name, fl) + TQWidget *parent, const char *name, WFlags fl) + : KSim::Progress(max, type, Panel, parent, name, fl) { init(); } KSim::LedLabel::LedLabel(int max, - TQWidget *tqparent, const char *name, WFlags fl) + TQWidget *parent, const char *name, WFlags fl) : KSim::Progress(max, KSim::Types::None, - Panel, tqparent, name, fl) + Panel, parent, name, fl) { init(); } diff --git a/ksim/library/led.h b/ksim/library/led.h index 8ed0a14..5c5e615 100644 --- a/ksim/library/led.h +++ b/ksim/library/led.h @@ -46,7 +46,7 @@ namespace KSim * @param ImageName is the image to display * the image's height is divided by 4 and each item is used for send in, * send out, receive in and receive out - * @param tqparent is the tqparent widget + * @param parent is the parent widget * @param name is the object instance name */ Led(Type type, const TQString &imageName); @@ -114,29 +114,29 @@ namespace KSim * * @param type is the theme type * @param label is the default text to display - * @param tqparent is the tqparent widget + * @param parent is the parent widget * @see KSim::ThemeLoader */ LedLabel(int max, int type, const TQString &label, - TQWidget *tqparent, const char *name = 0, WFlags fl = 0); + TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * Constructs a KSim::LedLabel. * * @param type is the theme type * @param label is the default text to display - * @param tqparent is the tqparent widget + * @param parent is the parent widget * @see KSim::ThemeLoader */ - LedLabel(int max, int type, TQWidget *tqparent, + LedLabel(int max, int type, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * Constructs a KSim::LedLabel. * * @param label is the default text to display - * @param tqparent is the tqparent widget + * @param parent is the parent widget * @see KSim::ThemeLoader */ - LedLabel(int max, TQWidget *tqparent, + LedLabel(int max, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * destructor for KSim::LedLabel. diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp index f3b941c..abe6609 100644 --- a/ksim/library/pluginmodule.cpp +++ b/ksim/library/pluginmodule.cpp @@ -77,19 +77,19 @@ class KSim::PluginPage::Private { public: KConfig *config; - KSim::PluginObject *tqparent; + KSim::PluginObject *parent; }; -KSim::PluginPage::PluginPage(KSim::PluginObject *tqparent, const char *name) +KSim::PluginPage::PluginPage(KSim::PluginObject *parent, const char *name) : TQWidget(0, name) { d = new PluginPage::Private; - d->tqparent = tqparent; - if (tqparent && !tqparent->configFileName().isEmpty()) - d->config = new KConfig(tqparent->configFileName() + "rc"); + d->parent = parent; + if (parent && !parent->configFileName().isEmpty()) + d->config = new KConfig(parent->configFileName() + "rc"); else { kdWarning() << className() << ": Can not create the config() " - "pointer due to the tqparent being null" << endl; + "pointer due to the parent being null" << endl; d->config = 0; } } @@ -111,25 +111,25 @@ KConfig *KSim::PluginPage::config() const class KSim::PluginView::Private { public: - PluginObject *tqparent; + PluginObject *parent; TQPopupMenu *popupMenu; KConfig *config; }; -KSim::PluginView::PluginView(KSim::PluginObject *tqparent, const char *name) +KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name) : TQWidget(0, name) { d = new PluginView::Private; - d->tqparent = tqparent; + d->parent = parent; d->popupMenu = new TQPopupMenu(this); d->popupMenu->insertItem(i18n("About"), this, TQT_SLOT(showAbout()), 0, -1, 0); - if (tqparent && !tqparent->configFileName().isEmpty()) - d->config = new KConfig(tqparent->configFileName() + "rc"); + if (parent && !parent->configFileName().isEmpty()) + d->config = new KConfig(parent->configFileName() + "rc"); else { kdWarning() << className() << ": Can not create the config() " - "pointer due to the tqparent being null" << endl; + "pointer due to the parent being null" << endl; d->config = 0; } } @@ -165,7 +165,7 @@ void KSim::PluginView::mousePressEvent(TQMouseEvent *ev) KSim::PluginObject *KSim::PluginView::parentPlugin() const { - return d->tqparent; + return d->parent; } void KSim::PluginView::showAbout() diff --git a/ksim/library/pluginmodule.h b/ksim/library/pluginmodule.h index 91285f4..56d491c 100644 --- a/ksim/library/pluginmodule.h +++ b/ksim/library/pluginmodule.h @@ -119,7 +119,7 @@ namespace KSim /** * constructor for PluginPage */ - PluginPage(KSim::PluginObject *tqparent, const char *name); + PluginPage(KSim::PluginObject *parent, const char *name); /** * destructor for PluginPage */ @@ -168,7 +168,7 @@ namespace KSim /** * constructor for PluginView */ - PluginView(KSim::PluginObject *tqparent, const char *name); + PluginView(KSim::PluginObject *parent, const char *name); /** * destructor for PluginView */ diff --git a/ksim/library/progress.cpp b/ksim/library/progress.cpp index bbdbd61..e37cff1 100644 --- a/ksim/library/progress.cpp +++ b/ksim/library/progress.cpp @@ -40,17 +40,17 @@ class KSim::Progress::Private }; KSim::Progress::Progress(int maxValue, - TQWidget *tqparent, const char *name, - WFlags fl) : KSim::Label(tqparent, name, fl) + TQWidget *parent, const char *name, + WFlags fl) : KSim::Label(parent, name, fl) { init(maxValue); configureObject(); } KSim::Progress::Progress(int maxValue, - int type, const TQString &label, TQWidget *tqparent, + int type, const TQString &label, TQWidget *parent, const char *name, WFlags fl) - : KSim::Label(type, label, tqparent, name, fl) + : KSim::Label(type, label, parent, name, fl) { init(maxValue); configureObject(); @@ -58,17 +58,17 @@ KSim::Progress::Progress(int maxValue, KSim::Progress::Progress(int maxValue, int type, const TQString &label, int value, - TQWidget *tqparent, const char *name, WFlags fl) - : KSim::Label(type, label, tqparent, name, fl) + TQWidget *parent, const char *name, WFlags fl) + : KSim::Label(type, label, parent, name, fl) { init(maxValue, value); configureObject(); } KSim::Progress::Progress(int maxValue, - int type, TQWidget *tqparent, + int type, TQWidget *parent, const char *name, WFlags fl) - : KSim::Label(type, tqparent, name, fl) + : KSim::Label(type, parent, name, fl) { init(maxValue); configureObject(); @@ -76,8 +76,8 @@ KSim::Progress::Progress(int maxValue, KSim::Progress::Progress(int maxValue, int type, ProgressType progressType, - TQWidget *tqparent, const char *name, WFlags fl) - : KSim::Label(type, tqparent, name, fl) + TQWidget *parent, const char *name, WFlags fl) + : KSim::Label(type, parent, name, fl) { init(maxValue, 0, progressType); configureObject(); diff --git a/ksim/library/progress.h b/ksim/library/progress.h index 09c4a21..0e30986 100644 --- a/ksim/library/progress.h +++ b/ksim/library/progress.h @@ -42,9 +42,9 @@ namespace KSim * @param maxValue is the maximum value * that the progress bar will show * @param label is the text that will be displayed - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ - Progress(int maxValue, TQWidget *tqparent, + Progress(int maxValue, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * constructs a KSim::Progress @@ -53,10 +53,10 @@ namespace KSim * that the progress bar will show * @param type is the theme type * @param label is the text that will be displayed - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ Progress(int maxValue, int type, const TQString &label, - TQWidget *tqparent, const char *name = 0, WFlags fl = 0); + TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * constructs a KSim::Progress * @@ -65,10 +65,10 @@ namespace KSim * @param type is the theme type * @param label is the text that will be displayed * @param value is the initial value to be displayed - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ Progress(int maxValue, int type, const TQString &label, - int value, TQWidget *tqparent, const char *name = 0, + int value, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * constructs a KSim::Progress @@ -76,9 +76,9 @@ namespace KSim * @param maxValue is the maximum value * that the progress bar will show * @param type is the theme type - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ - Progress(int maxValue, int type, TQWidget *tqparent, + Progress(int maxValue, int type, TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * constructs a KSim::Progress @@ -87,11 +87,11 @@ namespace KSim * that the progress bar will show * @param type is the theme type * @param progressType is onr of Progress::ProgressType - * @param tqparent is the tqparent widget + * @param parent is the parent widget */ Progress(int maxValue, int type, ProgressType progressType, - TQWidget *tqparent, const char *name = 0, + TQWidget *parent, const char *name = 0, WFlags fl = 0); /** * destructs KSim::Chart diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp index 58a6f61..3fced29 100644 --- a/ksim/library/themeloader.cpp +++ b/ksim/library/themeloader.cpp @@ -607,11 +607,11 @@ TQValueList<TQPixmap> KSim::Theme::pixmapToList(PixmapType type, for (int i = 0; i < (depth + 1); ++i) { newPixmap.fill(); - if (pixmap.tqmask()) { - TQBitmap tqmask(newPixmap.size()); - bitBlt(&tqmask, 0, 0, pixmap.tqmask(), xOffset, yOffset, + if (pixmap.mask()) { + TQBitmap mask(newPixmap.size()); + bitBlt(&mask, 0, 0, pixmap.mask(), xOffset, yOffset, image.width() - xOffset, size); - newPixmap.setMask(tqmask); + newPixmap.setMask(mask); } bitBlt(&newPixmap, 0, 0, &pixmap, xOffset, yOffset, diff --git a/ksim/monitorprefs.cpp b/ksim/monitorprefs.cpp index b89e7eb..0038c85 100644 --- a/ksim/monitorprefs.cpp +++ b/ksim/monitorprefs.cpp @@ -29,8 +29,8 @@ #include <ksimconfig.h> #include <pluginloader.h> -KSim::MonitorPrefs::MonitorPrefs(TQWidget *tqparent, const char *name) - : KListView(tqparent, name) +KSim::MonitorPrefs::MonitorPrefs(TQWidget *parent, const char *name) + : KListView(parent, name) { addColumn(i18n("Monitor")); addColumn(i18n("Description")); diff --git a/ksim/monitorprefs.h b/ksim/monitorprefs.h index c457472..2ecf4c9 100644 --- a/ksim/monitorprefs.h +++ b/ksim/monitorprefs.h @@ -32,7 +32,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - MonitorPrefs(TQWidget *tqparent, const char *name=0); + MonitorPrefs(TQWidget *parent, const char *name=0); ~MonitorPrefs(); public slots: diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index 9cb570a..39bbffd 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -107,8 +107,8 @@ void CpuPlugin::showAbout() KAboutApplication(&aboutData).exec(); } -CpuView::CpuView(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginView(tqparent, name) +CpuView::CpuView(KSim::PluginObject *parent, const char *name) + : KSim::PluginView(parent, name) { #ifdef Q_OS_LINUX m_procStream = 0L; @@ -361,8 +361,8 @@ KSim::Progress *CpuView::addLabel() return progress; } -CpuConfig::CpuConfig(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginPage(tqparent, name) +CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) + : KSim::PluginPage(parent, name) { TQVBoxLayout * mainLayout = new TQVBoxLayout( this ); mainLayout->setSpacing( 6 ); diff --git a/ksim/monitors/cpu/ksimcpu.h b/ksim/monitors/cpu/ksimcpu.h index 79e561e..a520b7b 100644 --- a/ksim/monitors/cpu/ksimcpu.h +++ b/ksim/monitors/cpu/ksimcpu.h @@ -54,7 +54,7 @@ class CpuView : public KSim::PluginView Q_OBJECT TQ_OBJECT public: - CpuView(KSim::PluginObject *tqparent, const char *name); + CpuView(KSim::PluginObject *parent, const char *name); ~CpuView(); virtual void reparseConfig(); @@ -203,7 +203,7 @@ class CpuConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - CpuConfig(KSim::PluginObject *tqparent, const char *name); + CpuConfig(KSim::PluginObject *parent, const char *name); ~CpuConfig(); virtual void saveConfig(); diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index 2365e19..c91f173 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -103,8 +103,8 @@ void DiskPlugin::showAbout() KAboutApplication(&aboutData).exec(); } -DiskView::DiskView(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginView(tqparent, name) +DiskView::DiskView(KSim::PluginObject *parent, const char *name) + : KSim::PluginView(parent, name) { #ifdef Q_OS_LINUX m_bLinux24 = true; @@ -472,8 +472,8 @@ void DiskView::cleanup() m_addAll = false; } -DiskConfig::DiskConfig(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginPage(tqparent, name) +DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name) + : KSim::PluginPage(parent, name) { m_layout = new TQVBoxLayout(this); m_layout->setSpacing(6); diff --git a/ksim/monitors/disk/ksimdisk.h b/ksim/monitors/disk/ksimdisk.h index f122fbf..1c97040 100644 --- a/ksim/monitors/disk/ksimdisk.h +++ b/ksim/monitors/disk/ksimdisk.h @@ -57,7 +57,7 @@ class DiskView : public KSim::PluginView Q_OBJECT TQ_OBJECT public: - DiskView(KSim::PluginObject *tqparent, const char *name); + DiskView(KSim::PluginObject *parent, const char *name); ~DiskView(); virtual void reparseConfig(); @@ -134,7 +134,7 @@ class DiskConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - DiskConfig(KSim::PluginObject *tqparent, const char *name); + DiskConfig(KSim::PluginObject *parent, const char *name); ~DiskConfig(); virtual void saveConfig(); diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index 4149aee..fb04470 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -85,8 +85,8 @@ void FilesystemWidget::Filesystem::setValue(int value) m_display->setValue(value); } -FilesystemWidget::FilesystemWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +FilesystemWidget::FilesystemWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_list.setAutoDelete(true); m_layout = new TQVBoxLayout(this); diff --git a/ksim/monitors/filesystem/filesystemwidget.h b/ksim/monitors/filesystem/filesystemwidget.h index b709125..a79a34f 100644 --- a/ksim/monitors/filesystem/filesystemwidget.h +++ b/ksim/monitors/filesystem/filesystemwidget.h @@ -32,7 +32,7 @@ class FilesystemWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - FilesystemWidget(TQWidget *tqparent, const char *name); + FilesystemWidget(TQWidget *parent, const char *name); ~FilesystemWidget(); void append(int, const TQString &); diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp index 937d2cc..6b8c928 100644 --- a/ksim/monitors/filesystem/fsystemconfig.cpp +++ b/ksim/monitors/filesystem/fsystemconfig.cpp @@ -37,17 +37,17 @@ class FSysViewItem : public TQCheckListItem { public: - FSysViewItem(TQListView *tqparent, const TQString &text1, + FSysViewItem(TQListView *parent, const TQString &text1, const TQString &text2, const TQString &text3) - : TQCheckListItem(tqparent, text1, CheckBox) + : TQCheckListItem(parent, text1, CheckBox) { setText(1, text2); setText(2, text3); } }; -FsystemConfig::FsystemConfig(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginPage(tqparent, name) +FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name) + : KSim::PluginPage(parent, name) { m_mainLayout = new TQGridLayout(this); m_mainLayout->setSpacing(6); diff --git a/ksim/monitors/filesystem/fsystemconfig.h b/ksim/monitors/filesystem/fsystemconfig.h index 96fccf1..82eafb7 100644 --- a/ksim/monitors/filesystem/fsystemconfig.h +++ b/ksim/monitors/filesystem/fsystemconfig.h @@ -35,7 +35,7 @@ class FsystemConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - FsystemConfig(KSim::PluginObject *tqparent, const char *name); + FsystemConfig(KSim::PluginObject *parent, const char *name); ~FsystemConfig(); virtual void saveConfig(); diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp index f73ce3d..9b08da9 100644 --- a/ksim/monitors/filesystem/ksimfsystem.cpp +++ b/ksim/monitors/filesystem/ksimfsystem.cpp @@ -81,9 +81,9 @@ void PluginModule::showAbout() KAboutApplication(&aboutData).exec(); } -Fsystem::Fsystem(KSim::PluginObject *tqparent, const char *name) +Fsystem::Fsystem(KSim::PluginObject *parent, const char *name) : DCOPObject("fsystem"), - KSim::PluginView(tqparent, name) + KSim::PluginView(parent, name) { config()->setGroup("Fsystem"); TQVBoxLayout *vbLayout = new TQVBoxLayout(this); diff --git a/ksim/monitors/filesystem/ksimfsystem.h b/ksim/monitors/filesystem/ksimfsystem.h index cf8dc9e..a9eefc6 100644 --- a/ksim/monitors/filesystem/ksimfsystem.h +++ b/ksim/monitors/filesystem/ksimfsystem.h @@ -53,7 +53,7 @@ class Fsystem : public KSim::PluginView, public FsystemIface /** * construtor of Fsystem, calls all init functions to create the plugin. */ - Fsystem(KSim::PluginObject *tqparent, const char *name); + Fsystem(KSim::PluginObject *parent, const char *name); ~Fsystem(); virtual void reparseConfig(); diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp index 2c209b4..c265055 100644 --- a/ksim/monitors/i8k/ksimi8k.cpp +++ b/ksim/monitors/i8k/ksimi8k.cpp @@ -72,8 +72,8 @@ void I8KPlugin::showAbout() KAboutApplication(&aboutData).exec(); } -I8KView::I8KView(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginView(tqparent, name), +I8KView::I8KView(KSim::PluginObject *parent, const char *name) + : KSim::PluginView(parent, name), m_timer( 0L ), m_procFile( 0L ), m_procStream( 0L ) { initGUI(); @@ -208,8 +208,8 @@ void I8KView::updateView() .tqarg( m_unit ) ); } -I8KConfig::I8KConfig(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginPage(tqparent, name) +I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name) + : KSim::PluginPage(parent, name) { m_unit = new TQCheckBox( i18n( "Show temperature in Fahrenheit" ), this ); diff --git a/ksim/monitors/i8k/ksimi8k.h b/ksim/monitors/i8k/ksimi8k.h index 76b8796..01383b5 100644 --- a/ksim/monitors/i8k/ksimi8k.h +++ b/ksim/monitors/i8k/ksimi8k.h @@ -52,7 +52,7 @@ class I8KView : public KSim::PluginView Q_OBJECT TQ_OBJECT public: - I8KView(KSim::PluginObject *tqparent, const char *name); + I8KView(KSim::PluginObject *parent, const char *name); ~I8KView(); virtual void reparseConfig(); @@ -84,7 +84,7 @@ class I8KConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - I8KConfig(KSim::PluginObject *tqparent, const char *name); + I8KConfig(KSim::PluginObject *parent, const char *name); ~I8KConfig(); virtual void saveConfig(); diff --git a/ksim/monitors/lm_sensors/NVCtrl.c b/ksim/monitors/lm_sensors/NVCtrl.c index dd5f500..6c61b8a 100644 --- a/ksim/monitors/lm_sensors/NVCtrl.c +++ b/ksim/monitors/lm_sensors/NVCtrl.c @@ -143,7 +143,7 @@ Bool XNVCTRLIsNvScreen ( void XNVCTRLSetAttribute ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, int value ){ @@ -157,7 +157,7 @@ void XNVCTRLSetAttribute ( req->reqType = info->codes->major_opcode; req->nvReqType = X_nvCtrlSetAttribute; req->screen = screen; - req->display_tqmask = display_tqmask; + req->display_mask = display_mask; req->attribute = attribute; req->value = value; UnlockDisplay (dpy); @@ -168,7 +168,7 @@ void XNVCTRLSetAttribute ( Bool XNVCTRLQueryAttribute ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, int *value ){ @@ -187,7 +187,7 @@ Bool XNVCTRLQueryAttribute ( req->reqType = info->codes->major_opcode; req->nvReqType = X_nvCtrlQueryAttribute; req->screen = screen; - req->display_tqmask = display_tqmask; + req->display_mask = display_mask; req->attribute = attribute; if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) { UnlockDisplay (dpy); @@ -205,7 +205,7 @@ Bool XNVCTRLQueryAttribute ( Bool XNVCTRLQueryStringAttribute ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, char **ptr ){ @@ -227,7 +227,7 @@ Bool XNVCTRLQueryStringAttribute ( req->reqType = info->codes->major_opcode; req->nvReqType = X_nvCtrlQueryStringAttribute; req->screen = screen; - req->display_tqmask = display_tqmask; + req->display_mask = display_mask; req->attribute = attribute; if (!_XReply (dpy, (xReply *) &rep, 0, False)) { UnlockDisplay (dpy); @@ -256,7 +256,7 @@ Bool XNVCTRLQueryStringAttribute ( Bool XNVCTRLQueryValidAttributeValues ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, NVCTRLAttributeValidValuesRec *values ){ @@ -277,7 +277,7 @@ Bool XNVCTRLQueryValidAttributeValues ( req->reqType = info->codes->major_opcode; req->nvReqType = X_nvCtrlQueryValidAttributeValues; req->screen = screen; - req->display_tqmask = display_tqmask; + req->display_mask = display_mask; req->attribute = attribute; if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) { UnlockDisplay (dpy); @@ -343,8 +343,8 @@ static Bool wire_to_event (Display *dpy, XEvent *host, xEvent *wire) re->attribute_changed.display = dpy; re->attribute_changed.time = event->u.attribute_changed.time; re->attribute_changed.screen = event->u.attribute_changed.screen; - re->attribute_changed.display_tqmask = - event->u.attribute_changed.display_tqmask; + re->attribute_changed.display_mask = + event->u.attribute_changed.display_mask; re->attribute_changed.attribute = event->u.attribute_changed.attribute; re->attribute_changed.value = event->u.attribute_changed.value; break; diff --git a/ksim/monitors/lm_sensors/NVCtrl.h b/ksim/monitors/lm_sensors/NVCtrl.h index 5e78e27..81c9432 100644 --- a/ksim/monitors/lm_sensors/NVCtrl.h +++ b/ksim/monitors/lm_sensors/NVCtrl.h @@ -26,7 +26,7 @@ /* * Integer attributes; these are settable/gettable via * XNVCTRLSetAttribute() and XNVCTRLQueryAttribute, respectively. - * Some attributes may only be read; some may require a display_tqmask + * Some attributes may only be read; some may require a display_mask * argument. This information is encoded in the "permission" comment * after each attribute #define, and can be queried at run time with * XNVCTRLQueryValidAttributeValues(). @@ -40,14 +40,14 @@ * various reasons: they represent static system information, they * can only be changed by changing an XF86Config option, etc). * - * D: The attribute requires the display tqmask argument. The + * D: The attribute requires the display mask argument. The * attributes NV_CTRL_CONNECTED_DISPLAYS and NV_CTRL_ENABLED_DISPLAYS - * will be a bittqmask of what display devices are connected and what + * will be a bitmask of what display devices are connected and what * display devices are enabled for use in X, respectively. Each bit - * in the bittqmask represents a display device; it is these bits which - * should be used as the display_tqmask when dealing with attributes + * in the bitmask represents a display device; it is these bits which + * should be used as the display_mask when dealing with attributes * designated with "D" below. For attributes that do not require the - * display tqmask, the argument is ignored. + * display mask, the argument is ignored. */ @@ -249,7 +249,7 @@ /* - * NV_CTRL_CONNECTED_DISPLAYS - returns a display tqmask indicating what + * NV_CTRL_CONNECTED_DISPLAYS - returns a display mask indicating what * display devices are connected to the GPU driving the specified X * screen. */ @@ -258,7 +258,7 @@ /* - * NV_CTRL_ENABLED_DISPLAYS - returns a display tqmask indicating what + * NV_CTRL_ENABLED_DISPLAYS - returns a display mask indicating what * display devices are enabled for use on the specified X screen. */ @@ -717,7 +717,7 @@ /* * NV_CTRL_STRING_DISPLAY_DEVICE_NAME - name of the display device - * specified in the display_tqmask argument. + * specified in the display_mask argument. */ #define NV_CTRL_STRING_DISPLAY_DEVICE_NAME 4 /* R-D */ @@ -746,7 +746,7 @@ * is no fixed range of valid values. * * ATTRIBUTE_TYPE_BITMASK : the attribute is an integer value, - * interpretted as a bittqmask. + * interpretted as a bitmask. * * ATTRIBUTE_TYPE_BOOL : the attribute is a boolean, valid values are * either 1 (on/true) or 0 (off/false). @@ -763,7 +763,7 @@ * which can only have certain values, depending on GPU. * * - * The permissions field of NVCTRLAttributeValidValuesRec is a bittqmask + * The permissions field of NVCTRLAttributeValidValuesRec is a bitmask * that may contain: * * ATTRIBUTE_TYPE_READ diff --git a/ksim/monitors/lm_sensors/NVCtrlLib.h b/ksim/monitors/lm_sensors/NVCtrlLib.h index 704071c..8d9cec4 100644 --- a/ksim/monitors/lm_sensors/NVCtrlLib.h +++ b/ksim/monitors/lm_sensors/NVCtrlLib.h @@ -55,7 +55,7 @@ Bool XNVCTRLIsNvScreen ( * Sets the attribute to the given value. The attributes and their * possible values are listed in NVCtrl.h. * - * Not all attributes require the display_tqmask parameter; see + * Not all attributes require the display_mask parameter; see * NVCtrl.h for details. * * Possible errors: @@ -66,7 +66,7 @@ Bool XNVCTRLIsNvScreen ( void XNVCTRLSetAttribute ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, int value ); @@ -78,7 +78,7 @@ void XNVCTRLSetAttribute ( * If XNVCTRLQueryAttribute returns True, value will contain the * value of the specified attribute. * - * Not all attributes require the display_tqmask parameter; see + * Not all attributes require the display_mask parameter; see * NVCtrl.h for details. * * Possible errors: @@ -90,7 +90,7 @@ void XNVCTRLSetAttribute ( Bool XNVCTRLQueryAttribute ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, int *value ); @@ -112,7 +112,7 @@ Bool XNVCTRLQueryAttribute ( Bool XNVCTRLQueryStringAttribute ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, char **ptr ); @@ -129,7 +129,7 @@ Bool XNVCTRLQueryStringAttribute ( Bool XNVCTRLQueryValidAttributeValues ( Display *dpy, int screen, - unsigned int display_tqmask, + unsigned int display_mask, unsigned int attribute, NVCTRLAttributeValidValuesRec *values ); @@ -166,7 +166,7 @@ typedef struct { Display *display; Time time; int screen; - unsigned int display_tqmask; + unsigned int display_mask; unsigned int attribute; int value; } XNVCtrlAttributeChangedEvent; diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp index 76bc4c3..eb2614f 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.cpp +++ b/ksim/monitors/lm_sensors/ksimsensors.cpp @@ -71,8 +71,8 @@ void PluginModule::showAbout() KAboutApplication(&aboutData).exec(); } -SensorsView::SensorsView(KSim::PluginObject *tqparent, const char *name) - : DCOPObject("sensors"), KSim::PluginView(tqparent, name) +SensorsView::SensorsView(KSim::PluginObject *parent, const char *name) + : DCOPObject("sensors"), KSim::PluginView(parent, name) { config()->setGroup("Sensors"); (new TQVBoxLayout(this))->setAutoAdd(true); diff --git a/ksim/monitors/lm_sensors/ksimsensors.h b/ksim/monitors/lm_sensors/ksimsensors.h index 195899e..97fa757 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.h +++ b/ksim/monitors/lm_sensors/ksimsensors.h @@ -50,7 +50,7 @@ class SensorsView : public KSim::PluginView, public KSimSensorsIface Q_OBJECT TQ_OBJECT public: - SensorsView(KSim::PluginObject *tqparent, const char *name); + SensorsView(KSim::PluginObject *parent, const char *name); ~SensorsView(); virtual void reparseConfig(); diff --git a/ksim/monitors/lm_sensors/nv_control.h b/ksim/monitors/lm_sensors/nv_control.h index 9900a00..d94ee95 100644 --- a/ksim/monitors/lm_sensors/nv_control.h +++ b/ksim/monitors/lm_sensors/nv_control.h @@ -87,7 +87,7 @@ typedef struct { CARD8 nvReqType; CARD16 length B16; CARD32 screen B32; - CARD32 display_tqmask B32; + CARD32 display_mask B32; CARD32 attribute B32; } xnvCtrlQueryAttributeReq; #define sz_xnvCtrlQueryAttributeReq 16 @@ -111,7 +111,7 @@ typedef struct { CARD8 nvReqType; CARD16 length B16; CARD32 screen B32; - CARD32 display_tqmask B32; + CARD32 display_mask B32; CARD32 attribute B32; INT32 value B32; } xnvCtrlSetAttributeReq; @@ -122,7 +122,7 @@ typedef struct { CARD8 nvReqType; CARD16 length B16; CARD32 screen B32; - CARD32 display_tqmask B32; + CARD32 display_mask B32; CARD32 attribute B32; } xnvCtrlQueryStringAttributeReq; #define sz_xnvCtrlQueryStringAttributeReq 16 @@ -150,7 +150,7 @@ typedef struct { CARD8 nvReqType; CARD16 length B16; CARD32 screen B32; - CARD32 display_tqmask B32; + CARD32 display_mask B32; CARD32 attribute B32; } xnvCtrlQueryValidAttributeValuesReq; #define sz_xnvCtrlQueryValidAttributeValuesReq 16 @@ -192,7 +192,7 @@ typedef struct { CARD16 sequenceNumber B16; Time time B32; CARD32 screen B32; - CARD32 display_tqmask B32; + CARD32 display_mask B32; CARD32 attribute B32; CARD32 value B32; CARD32 pad0 B32; diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp index 8b1ff46..1f1cf10 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.cpp +++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp @@ -40,10 +40,10 @@ class SensorViewItem : public TQCheckListItem { public: - SensorViewItem(TQListView *tqparent, const TQString &text1, + SensorViewItem(TQListView *parent, const TQString &text1, const TQString &text2, const TQString &text3, const TQString &text4) - : TQCheckListItem(tqparent, text1, CheckBox) + : TQCheckListItem(parent, text1, CheckBox) { setText(1, text2); setText(2, text3); @@ -51,8 +51,8 @@ class SensorViewItem : public TQCheckListItem } }; -SensorsConfig::SensorsConfig(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginPage(tqparent, name) +SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name) + : KSim::PluginPage(parent, name) { m_layout = new TQGridLayout(this); m_layout->setSpacing(6); diff --git a/ksim/monitors/lm_sensors/sensorsconfig.h b/ksim/monitors/lm_sensors/sensorsconfig.h index f37c599..6e27e3d 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.h +++ b/ksim/monitors/lm_sensors/sensorsconfig.h @@ -38,7 +38,7 @@ class SensorsConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - SensorsConfig(KSim::PluginObject *tqparent, const char *name); + SensorsConfig(KSim::PluginObject *parent, const char *name); ~SensorsConfig(); void saveConfig(); diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp index 260ad8e..f6cbe4a 100644 --- a/ksim/monitors/mail/ksimmail.cpp +++ b/ksim/monitors/mail/ksimmail.cpp @@ -66,8 +66,8 @@ void MailPlugin::showAbout() KAboutApplication( &about ).exec(); } -MailView::MailView( KSim::PluginObject* tqparent, const char* name ) - : KSim::PluginView( tqparent, name ) +MailView::MailView( KSim::PluginObject* parent, const char* name ) + : KSim::PluginView( parent, name ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); @@ -87,8 +87,8 @@ void MailView::updateDisplay() { } -MailLabel::MailLabel( TQWidget* tqparent ) - : KSim::Label( KSim::Types::Mail, tqparent ) +MailLabel::MailLabel( TQWidget* parent ) + : KSim::Label( KSim::Types::Mail, parent ) { // label->setPixmap( KSim::ThemeLoader::self().current().krellMail() ); configureObject( false ); @@ -131,17 +131,17 @@ TQPixmap MailLabel::frame( const TQPixmap& source, int number ) const { TQPixmap result( source.width(), source.height() / m_frames ); bitBlt( &result, 0, 0, &source, 0, number * source.height() / m_frames ); - if ( source.tqmask() ) + if ( source.mask() ) { - TQBitmap tqmask( result.size() ); - bitBlt( &tqmask, 0, 0, source.tqmask(), 0, number * source.height() / m_frames ); - result.setMask( tqmask ); + TQBitmap mask( result.size() ); + bitBlt( &mask, 0, 0, source.mask(), 0, number * source.height() / m_frames ); + result.setMask( mask ); } return result; } -MailConfig::MailConfig( KSim::PluginObject* tqparent, const char* name ) - : KSim::PluginPage( tqparent, name ) +MailConfig::MailConfig( KSim::PluginObject* parent, const char* name ) + : KSim::PluginPage( parent, name ) { } diff --git a/ksim/monitors/mail/ksimmail.h b/ksim/monitors/mail/ksimmail.h index 776d574..3ecb647 100644 --- a/ksim/monitors/mail/ksimmail.h +++ b/ksim/monitors/mail/ksimmail.h @@ -41,7 +41,7 @@ class MailView : public KSim::PluginView Q_OBJECT TQ_OBJECT public: - MailView( KSim::PluginObject* tqparent, const char* name ); + MailView( KSim::PluginObject* parent, const char* name ); ~MailView(); virtual void reparseConfig(); @@ -55,7 +55,7 @@ class MailLabel : public KSim::Label Q_OBJECT TQ_OBJECT public: - MailLabel( TQWidget* tqparent ); + MailLabel( TQWidget* parent ); virtual ~MailLabel(); virtual void configureObject( bool ); @@ -81,7 +81,7 @@ class MailConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - MailConfig( KSim::PluginObject* tqparent, const char* name ); + MailConfig( KSim::PluginObject* parent, const char* name ); ~MailConfig(); virtual void saveConfig(); diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index daaeb90..42e0ffd 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -99,8 +99,8 @@ void NetPlugin::showAbout() KAboutApplication(&aboutData).exec(); } -NetView::NetView(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginView(tqparent, name) +NetView::NetView(KSim::PluginObject *parent, const char *name) + : KSim::PluginView(parent, name) { #ifdef __linux__ m_procStream = 0L; diff --git a/ksim/monitors/net/ksimnet.h b/ksim/monitors/net/ksimnet.h index 3bd8cb1..87ad691 100644 --- a/ksim/monitors/net/ksimnet.h +++ b/ksim/monitors/net/ksimnet.h @@ -45,7 +45,7 @@ class NetView : public KSim::PluginView Q_OBJECT TQ_OBJECT public: - NetView(KSim::PluginObject *tqparent, const char *name); + NetView(KSim::PluginObject *parent, const char *name); ~NetView(); virtual void reparseConfig(); diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp index 9a19047..f3e98b7 100644 --- a/ksim/monitors/net/netconfig.cpp +++ b/ksim/monitors/net/netconfig.cpp @@ -34,8 +34,8 @@ #include "netconfig.moc" #include "netdialog.h" -NetConfig::NetConfig(KSim::PluginObject *tqparent, const char *name) - : KSim::PluginPage(tqparent, name) +NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) + : KSim::PluginPage(parent, name) { m_yes = i18n("yes"); m_no = i18n("no"); diff --git a/ksim/monitors/net/netconfig.h b/ksim/monitors/net/netconfig.h index 2d07176..4d6de56 100644 --- a/ksim/monitors/net/netconfig.h +++ b/ksim/monitors/net/netconfig.h @@ -35,7 +35,7 @@ class NetConfig : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - NetConfig(KSim::PluginObject *tqparent, const char *name); + NetConfig(KSim::PluginObject *parent, const char *name); virtual ~NetConfig(); virtual void saveConfig(); diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index d79f06f..c470a2c 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -49,8 +49,8 @@ #include <string.h> -NetDialog::NetDialog(TQWidget *tqparent, const char *name) - : TQTabDialog(tqparent, name, true) +NetDialog::NetDialog(TQWidget *parent, const char *name) + : TQTabDialog(parent, name, true) { m_clicked = false; setCaption(kapp->makeStdCaption(i18n("Network Interface"))); diff --git a/ksim/monitors/net/netdialog.h b/ksim/monitors/net/netdialog.h index 094e40a..2b9f7b1 100644 --- a/ksim/monitors/net/netdialog.h +++ b/ksim/monitors/net/netdialog.h @@ -37,7 +37,7 @@ class NetDialog : public TQTabDialog Q_OBJECT TQ_OBJECT public: - NetDialog(TQWidget *tqparent, const char *name = 0); + NetDialog(TQWidget *parent, const char *name = 0); ~NetDialog(); const TQString deviceName() const; diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp index 75f2dac..6480bf5 100644 --- a/ksim/monitors/snmp/browsedialog.cpp +++ b/ksim/monitors/snmp/browsedialog.cpp @@ -29,8 +29,8 @@ using namespace KSim::Snmp; -BrowseDialog::BrowseDialog( const HostConfig &hostConfig, const TQString ¤tOid, TQWidget *tqparent, const char *name ) - : BrowseDialogBase( tqparent, name ), m_host( hostConfig ) +BrowseDialog::BrowseDialog( const HostConfig &hostConfig, const TQString ¤tOid, TQWidget *parent, const char *name ) + : BrowseDialogBase( parent, name ), m_host( hostConfig ) { stop->setGuiItem( KGuiItem( i18n( "&Stop" ), "stop" ) ); diff --git a/ksim/monitors/snmp/browsedialog.h b/ksim/monitors/snmp/browsedialog.h index 7dfb4f7..2e605b8 100644 --- a/ksim/monitors/snmp/browsedialog.h +++ b/ksim/monitors/snmp/browsedialog.h @@ -41,7 +41,7 @@ class BrowseDialog : public BrowseDialogBase Q_OBJECT TQ_OBJECT public: - BrowseDialog( const HostConfig &hostConfig, const TQString ¤tOid, TQWidget *tqparent, const char *name = 0 ); + BrowseDialog( const HostConfig &hostConfig, const TQString ¤tOid, TQWidget *parent, const char *name = 0 ); TQString selectedObjectIdentifier() const; diff --git a/ksim/monitors/snmp/chartmonitor.cpp b/ksim/monitors/snmp/chartmonitor.cpp index 4682c3b..1679eb6 100644 --- a/ksim/monitors/snmp/chartmonitor.cpp +++ b/ksim/monitors/snmp/chartmonitor.cpp @@ -22,8 +22,8 @@ using namespace KSim::Snmp; -ChartMonitor::ChartMonitor( const MonitorConfig &config, TQWidget *tqparent, const char *name ) - : KSim::Chart( true /* displayMeter */, 0, TQString(), tqparent, name ), +ChartMonitor::ChartMonitor( const MonitorConfig &config, TQWidget *parent, const char *name ) + : KSim::Chart( true /* displayMeter */, 0, TQString(), parent, name ), m_lastValue( 0 ), m_config( config ), m_firstSampleReceived( false ) { setTitle( m_config.name ); diff --git a/ksim/monitors/snmp/chartmonitor.h b/ksim/monitors/snmp/chartmonitor.h index 6713238..b147922 100644 --- a/ksim/monitors/snmp/chartmonitor.h +++ b/ksim/monitors/snmp/chartmonitor.h @@ -33,7 +33,7 @@ class ChartMonitor : public KSim::Chart Q_OBJECT TQ_OBJECT public: - ChartMonitor( const MonitorConfig &config, TQWidget *tqparent, const char *name = 0 ); + ChartMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 ); public slots: void setData( const Value &data ); diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp index f5c1d24..ee50054 100644 --- a/ksim/monitors/snmp/configpage.cpp +++ b/ksim/monitors/snmp/configpage.cpp @@ -43,8 +43,8 @@ static bool listViewHasSelection( TQListView *lv ) return false; } -ConfigPage::ConfigPage( Plugin *tqparent, const char *name ) - : KSim::PluginPage( tqparent, name ) +ConfigPage::ConfigPage( Plugin *parent, const char *name ) + : KSim::PluginPage( parent, name ) { ( new TQVBoxLayout( this ) )->setAutoAdd( true ); diff --git a/ksim/monitors/snmp/configpage.h b/ksim/monitors/snmp/configpage.h index f8b811c..6027862 100644 --- a/ksim/monitors/snmp/configpage.h +++ b/ksim/monitors/snmp/configpage.h @@ -35,14 +35,14 @@ namespace Snmp class HostItem : public TQListViewItem { public: - HostItem( TQListView *tqparent, const KSim::Snmp::HostConfig &src ) - : TQListViewItem( tqparent, TQString(), TQString(), TQString() ) + HostItem( TQListView *parent, const KSim::Snmp::HostConfig &src ) + : TQListViewItem( parent, TQString(), TQString(), TQString() ) { setFromHostConfig( src ); } - HostItem( TQListView *tqparent ) - : TQListViewItem( tqparent, TQString(), TQString(), TQString() ) + HostItem( TQListView *parent ) + : TQListViewItem( parent, TQString(), TQString(), TQString() ) {} void setFromHostConfig( const KSim::Snmp::HostConfig &src ) @@ -56,14 +56,14 @@ public: class MonitorItem : public TQListViewItem { public: - MonitorItem( TQListView *tqparent, const KSim::Snmp::MonitorConfig &monitor ) - : TQListViewItem( tqparent, TQString(), TQString(), TQString() ) + MonitorItem( TQListView *parent, const KSim::Snmp::MonitorConfig &monitor ) + : TQListViewItem( parent, TQString(), TQString(), TQString() ) { setFromMonitor( monitor ); } - MonitorItem( TQListView *tqparent ) - : TQListViewItem( tqparent, TQString(), TQString(), TQString() ) + MonitorItem( TQListView *parent ) + : TQListViewItem( parent, TQString(), TQString(), TQString() ) {} void setFromMonitor( const KSim::Snmp::MonitorConfig &monitor ) @@ -81,7 +81,7 @@ class ConfigPage : public KSim::PluginPage Q_OBJECT TQ_OBJECT public: - ConfigPage( Plugin *tqparent, const char *name ); + ConfigPage( Plugin *parent, const char *name ); ~ConfigPage(); virtual void saveConfig(); diff --git a/ksim/monitors/snmp/hostdialog.cpp b/ksim/monitors/snmp/hostdialog.cpp index 2ea7314..7d66a75 100644 --- a/ksim/monitors/snmp/hostdialog.cpp +++ b/ksim/monitors/snmp/hostdialog.cpp @@ -35,15 +35,15 @@ using namespace KSim::Snmp; -HostDialog::HostDialog( TQWidget *tqparent, const char *name ) - : HostDialogBase( tqparent, name ) +HostDialog::HostDialog( TQWidget *parent, const char *name ) + : HostDialogBase( parent, name ) { init(); port->setValue( 161 ); } -HostDialog::HostDialog( const HostConfig &src, TQWidget *tqparent, const char *name ) - : HostDialogBase( tqparent, name ) +HostDialog::HostDialog( const HostConfig &src, TQWidget *parent, const char *name ) + : HostDialogBase( parent, name ) { init( src ); } diff --git a/ksim/monitors/snmp/hostdialog.h b/ksim/monitors/snmp/hostdialog.h index d384881..ba5e1c5 100644 --- a/ksim/monitors/snmp/hostdialog.h +++ b/ksim/monitors/snmp/hostdialog.h @@ -35,8 +35,8 @@ class HostDialog : public HostDialogBase Q_OBJECT TQ_OBJECT public: - HostDialog( TQWidget *tqparent, const char *name = 0 ); - HostDialog( const HostConfig &src, TQWidget *tqparent, const char *name = 0 ); + HostDialog( TQWidget *parent, const char *name = 0 ); + HostDialog( const HostConfig &src, TQWidget *parent, const char *name = 0 ); HostConfig settings() const; diff --git a/ksim/monitors/snmp/labelmonitor.cpp b/ksim/monitors/snmp/labelmonitor.cpp index 5e7ea34..2245a09 100644 --- a/ksim/monitors/snmp/labelmonitor.cpp +++ b/ksim/monitors/snmp/labelmonitor.cpp @@ -21,8 +21,8 @@ using namespace KSim::Snmp; -LabelMonitor::LabelMonitor( const MonitorConfig &config, TQWidget *tqparent, const char *name ) - : KSim::Label( tqparent, name ), m_config( config ) +LabelMonitor::LabelMonitor( const MonitorConfig &config, TQWidget *parent, const char *name ) + : KSim::Label( parent, name ), m_config( config ) { } diff --git a/ksim/monitors/snmp/labelmonitor.h b/ksim/monitors/snmp/labelmonitor.h index 6ff8404..90ffd90 100644 --- a/ksim/monitors/snmp/labelmonitor.h +++ b/ksim/monitors/snmp/labelmonitor.h @@ -35,7 +35,7 @@ class LabelMonitor : public KSim::Label Q_OBJECT TQ_OBJECT public: - LabelMonitor( const MonitorConfig &config, TQWidget *tqparent, const char *name = 0 ); + LabelMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 ); public slots: void setData( const Value &data ); diff --git a/ksim/monitors/snmp/monitor.cpp b/ksim/monitors/snmp/monitor.cpp index 414f4d9..052d2c0 100644 --- a/ksim/monitors/snmp/monitor.cpp +++ b/ksim/monitors/snmp/monitor.cpp @@ -24,8 +24,8 @@ using namespace KSim::Snmp; -Monitor::Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), m_oid( oid ), m_session( host ) +Monitor::Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *parent, const char *name ) + : TQObject( parent, name ), m_oid( oid ), m_session( host ) { if ( refresh > 0 ) m_timerId = startTimer( refresh ); diff --git a/ksim/monitors/snmp/monitor.h b/ksim/monitors/snmp/monitor.h index 5b88b46..0fddbef 100644 --- a/ksim/monitors/snmp/monitor.h +++ b/ksim/monitors/snmp/monitor.h @@ -36,7 +36,7 @@ class Monitor : public TQObject, public TQThread Q_OBJECT TQ_OBJECT public: - Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *tqparent = 0, const char *name = 0 ); + Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *parent = 0, const char *name = 0 ); virtual ~Monitor(); signals: diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp index b8cd756..1bcbb0b 100644 --- a/ksim/monitors/snmp/monitorconfig.cpp +++ b/ksim/monitors/snmp/monitorconfig.cpp @@ -93,7 +93,7 @@ void MonitorConfig::save( KConfigBase &config ) const config.writeEntry( "DisplayCurrentValueInline", displayCurrentValueInline ); } -TQWidget *MonitorConfig::createMonitorWidget( TQWidget *tqparent, const char *name ) +TQWidget *MonitorConfig::createMonitorWidget( TQWidget *parent, const char *name ) { TQWidget *w; @@ -103,9 +103,9 @@ TQWidget *MonitorConfig::createMonitorWidget( TQWidget *tqparent, const char *na return 0; if ( display == Label ) - w = new LabelMonitor( *this, tqparent, name ); + w = new LabelMonitor( *this, parent, name ); else - w = new ChartMonitor( *this, tqparent, name ); + w = new ChartMonitor( *this, parent, name ); Monitor *monitor = new Monitor( host, id, refresh, TQT_TQOBJECT(w) ); TQObject::connect( monitor, TQT_SIGNAL( newData( const Value & ) ), diff --git a/ksim/monitors/snmp/monitorconfig.h b/ksim/monitors/snmp/monitorconfig.h index 00554d7..cf2d525 100644 --- a/ksim/monitors/snmp/monitorconfig.h +++ b/ksim/monitors/snmp/monitorconfig.h @@ -41,7 +41,7 @@ struct MonitorConfig bool isNull() const { return name.isEmpty() || host.isNull(); } - TQWidget *createMonitorWidget( TQWidget *tqparent, const char *name = 0 ); + TQWidget *createMonitorWidget( TQWidget *parent, const char *name = 0 ); HostConfig host; TQString name; diff --git a/ksim/monitors/snmp/monitordialog.cpp b/ksim/monitors/snmp/monitordialog.cpp index 574f244..1bda0aa 100644 --- a/ksim/monitors/snmp/monitordialog.cpp +++ b/ksim/monitors/snmp/monitordialog.cpp @@ -37,14 +37,14 @@ using namespace KSim::Snmp; -MonitorDialog::MonitorDialog( const HostConfigMap &hosts, TQWidget *tqparent, const char *name ) - : MonitorDialogBase( tqparent, name ), m_hosts( hosts ) +MonitorDialog::MonitorDialog( const HostConfigMap &hosts, TQWidget *parent, const char *name ) + : MonitorDialogBase( parent, name ), m_hosts( hosts ) { init(); } -MonitorDialog::MonitorDialog( const MonitorConfig &monitor, const HostConfigMap &hosts, TQWidget *tqparent, const char *name ) - : MonitorDialogBase( tqparent, name ), m_hosts( hosts ) +MonitorDialog::MonitorDialog( const MonitorConfig &monitor, const HostConfigMap &hosts, TQWidget *parent, const char *name ) + : MonitorDialogBase( parent, name ), m_hosts( hosts ) { init( monitor ); } diff --git a/ksim/monitors/snmp/monitordialog.h b/ksim/monitors/snmp/monitordialog.h index 62ab5e2..eee6634 100644 --- a/ksim/monitors/snmp/monitordialog.h +++ b/ksim/monitors/snmp/monitordialog.h @@ -34,8 +34,8 @@ class MonitorDialog : public MonitorDialogBase Q_OBJECT TQ_OBJECT public: - MonitorDialog( const HostConfigMap &hosts, TQWidget *tqparent, const char *name = 0 ); - MonitorDialog( const MonitorConfig &monitor, const HostConfigMap &hosts, TQWidget *tqparent, const char *name = 0 ); + MonitorDialog( const HostConfigMap &hosts, TQWidget *parent, const char *name = 0 ); + MonitorDialog( const MonitorConfig &monitor, const HostConfigMap &hosts, TQWidget *parent, const char *name = 0 ); MonitorConfig monitorConfig() const; diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp index 8edfe69..7261f21 100644 --- a/ksim/monitors/snmp/probedialog.cpp +++ b/ksim/monitors/snmp/probedialog.cpp @@ -38,8 +38,8 @@ static const char * const probeIdentifiers[] = 0 }; -ProbeDialog::ProbeDialog( const HostConfig &hostConfig, TQWidget *tqparent, const char *name ) - : KProgressDialog( tqparent, name, i18n( "SNMP Host Probe" ), TQString(), true /* modal */ ), +ProbeDialog::ProbeDialog( const HostConfig &hostConfig, TQWidget *parent, const char *name ) + : KProgressDialog( parent, name, i18n( "SNMP Host Probe" ), TQString(), true /* modal */ ), m_host( hostConfig ), m_currentMonitor( 0 ), m_canceled( false ) { setLabel( i18n( "Probing for common object identifiers..." ) ); diff --git a/ksim/monitors/snmp/probedialog.h b/ksim/monitors/snmp/probedialog.h index 9ce949f..98e705b 100644 --- a/ksim/monitors/snmp/probedialog.h +++ b/ksim/monitors/snmp/probedialog.h @@ -40,7 +40,7 @@ class ProbeDialog : public KProgressDialog Q_OBJECT TQ_OBJECT public: - ProbeDialog( const HostConfig &hostConfig, TQWidget *tqparent, const char *name = 0 ); + ProbeDialog( const HostConfig &hostConfig, TQWidget *parent, const char *name = 0 ); struct ProbeResult { diff --git a/ksim/monitors/snmp/proberesultdialog.cpp b/ksim/monitors/snmp/proberesultdialog.cpp index fbdd4e6..1c8033a 100644 --- a/ksim/monitors/snmp/proberesultdialog.cpp +++ b/ksim/monitors/snmp/proberesultdialog.cpp @@ -27,8 +27,8 @@ using namespace KSim::Snmp; ProbeResultDialog::ProbeResultDialog( const HostConfig &hostConfig, const ProbeDialog::ProbeResultList &probeResults, - TQWidget *tqparent, const char *name ) - : ProbeResultDialogBase( tqparent, name ) + TQWidget *parent, const char *name ) + : ProbeResultDialogBase( parent, name ) { info->setText( i18n( "Results of scanning host %1:" ).tqarg( hostConfig.name ) ); diff --git a/ksim/monitors/snmp/proberesultdialog.h b/ksim/monitors/snmp/proberesultdialog.h index 47e012a..66300bf 100644 --- a/ksim/monitors/snmp/proberesultdialog.h +++ b/ksim/monitors/snmp/proberesultdialog.h @@ -36,7 +36,7 @@ class ProbeResultDialog : public ProbeResultDialogBase TQ_OBJECT public: ProbeResultDialog( const HostConfig &hostConfig, const ProbeDialog::ProbeResultList &probeResults, - TQWidget *tqparent, const char *name = 0 ); + TQWidget *parent, const char *name = 0 ); private: void addResultItem( const ProbeDialog::ProbeResult &result ); diff --git a/ksim/monitors/snmp/view.cpp b/ksim/monitors/snmp/view.cpp index c6482ab..9515645 100644 --- a/ksim/monitors/snmp/view.cpp +++ b/ksim/monitors/snmp/view.cpp @@ -29,8 +29,8 @@ using namespace KSim::Snmp; -View::View( Plugin *tqparent, const char *name ) - : KSim::PluginView( tqparent, name ) +View::View( Plugin *parent, const char *name ) + : KSim::PluginView( parent, name ) { m_layout = new TQVBoxLayout( this ); diff --git a/ksim/monitors/snmp/view.h b/ksim/monitors/snmp/view.h index af27e23..a87af87 100644 --- a/ksim/monitors/snmp/view.h +++ b/ksim/monitors/snmp/view.h @@ -37,7 +37,7 @@ class View : public KSim::PluginView Q_OBJECT TQ_OBJECT public: - View( Plugin *tqparent, const char *name ); + View( Plugin *parent, const char *name ); ~View(); virtual void reparseConfig(); diff --git a/ksim/monitors/snmp/walker.cpp b/ksim/monitors/snmp/walker.cpp index 70af99d..0aa6c0a 100644 --- a/ksim/monitors/snmp/walker.cpp +++ b/ksim/monitors/snmp/walker.cpp @@ -38,8 +38,8 @@ namespace static const uint walkerRefresh = 0; -Walker::Walker( const HostConfig &host, const Identifier &startOid, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), m_stop( false ), m_oid( startOid ), m_session( host ) +Walker::Walker( const HostConfig &host, const Identifier &startOid, TQObject *parent, const char *name ) + : TQObject( parent, name ), m_stop( false ), m_oid( startOid ), m_session( host ) { m_timerId = startTimer( walkerRefresh ); start(); diff --git a/ksim/monitors/snmp/walker.h b/ksim/monitors/snmp/walker.h index c9f8e52..19b440b 100644 --- a/ksim/monitors/snmp/walker.h +++ b/ksim/monitors/snmp/walker.h @@ -38,7 +38,7 @@ class Walker : public TQObject, public TQThread Q_OBJECT TQ_OBJECT public: - Walker( const HostConfig &host, const Identifier &startOid, TQObject *tqparent, const char *name = 0 ); + Walker( const HostConfig &host, const Identifier &startOid, TQObject *parent, const char *name = 0 ); virtual ~Walker(); struct Result diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp index 4b2ee3f..afabec5 100644 --- a/ksim/themeprefs.cpp +++ b/ksim/themeprefs.cpp @@ -46,8 +46,8 @@ class ThemeViewItem : public KListViewItem { public: - ThemeViewItem(TQListView *tqparent, const TQString &text, - const KURL &url) : KListViewItem(tqparent, text) + ThemeViewItem(TQListView *parent, const TQString &text, + const KURL &url) : KListViewItem(parent, text) { m_url = url; } @@ -58,8 +58,8 @@ class ThemeViewItem : public KListViewItem KURL m_url; }; -KSim::ThemePrefs::ThemePrefs(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) + : TQWidget(parent, name) { m_themeLayout = new TQGridLayout(this); m_themeLayout->setSpacing(6); diff --git a/ksim/themeprefs.h b/ksim/themeprefs.h index 12278a4..ec788b3 100644 --- a/ksim/themeprefs.h +++ b/ksim/themeprefs.h @@ -78,7 +78,7 @@ namespace KSim Q_OBJECT TQ_OBJECT public: - ThemePrefs(TQWidget *tqparent, const char *name=0); + ThemePrefs(TQWidget *parent, const char *name=0); ~ThemePrefs(); public slots: diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp index 36cc998..a387d87 100644 --- a/ktimer/ktimer.cpp +++ b/ktimer/ktimer.cpp @@ -39,15 +39,15 @@ class KTimerJobItem : public TQListViewItem { public: - KTimerJobItem( KTimerJob *job, TQListView *tqparent ) - : TQListViewItem( tqparent ) { + KTimerJobItem( KTimerJob *job, TQListView *parent ) + : TQListViewItem( parent ) { m_job = job; m_error = false; update(); }; - KTimerJobItem( KTimerJob *job, TQListView *tqparent, TQListViewItem *after ) - : TQListViewItem( tqparent, after ) { + KTimerJobItem( KTimerJob *job, TQListView *parent, TQListViewItem *after ) + : TQListViewItem( parent, after ) { m_job = job; m_error = false; update(); @@ -97,8 +97,8 @@ struct KTimerPrefPrivate TQPtrList<KTimerJob> jobs; }; -KTimerPref::KTimerPref( TQWidget *tqparent, const char *name ) - : PrefWidget( tqparent, name ) +KTimerPref::KTimerPref( TQWidget *parent, const char *name ) + : PrefWidget( parent, name ) { d = new KTimerPrefPrivate; @@ -306,8 +306,8 @@ struct KTimerJobPrivate { }; -KTimerJob::KTimerJob( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +KTimerJob::KTimerJob( TQObject *parent, const char *name ) + : TQObject( parent, name ) { d = new KTimerJobPrivate; diff --git a/ktimer/ktimer.h b/ktimer/ktimer.h index f1a2c69..5f8cb4f 100644 --- a/ktimer/ktimer.h +++ b/ktimer/ktimer.h @@ -32,7 +32,7 @@ class KTimerJob : public TQObject { TQ_OBJECT public: - KTimerJob( TQObject *tqparent=0, const char *name=0 ); + KTimerJob( TQObject *parent=0, const char *name=0 ); virtual ~KTimerJob(); enum States { Stopped, Paused, Started }; @@ -93,7 +93,7 @@ class KTimerPref : public PrefWidget Q_OBJECT TQ_OBJECT public: - KTimerPref( TQWidget *tqparent=0, const char *name = 0 ); + KTimerPref( TQWidget *parent=0, const char *name = 0 ); virtual ~KTimerPref(); protected slots: diff --git a/kwallet/allyourbase.cpp b/kwallet/allyourbase.cpp index 2846172..c031b35 100644 --- a/kwallet/allyourbase.cpp +++ b/kwallet/allyourbase.cpp @@ -38,8 +38,8 @@ /**************** * KWalletFolderItem - ListView items to represent kwallet folders */ -KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* tqparent, const TQString &name, int entries) -: KListViewItem(tqparent),_wallet(w),_name(name),_entries(entries) { +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)").tqarg(_name).tqarg(_entries)); setRenameEnabled(0, false); setDragEnabled(true); @@ -121,8 +121,8 @@ KWalletFolderItem::~KWalletFolderItem() { * KWalletContainerItem - ListView items to represent kwallet containers, i.e. * passwords, maps, ... */ -KWalletContainerItem::KWalletContainerItem(TQListViewItem* tqparent, const TQString &name, KWallet::Wallet::EntryType type) -: KListViewItem(tqparent, name), _type(type) { +KWalletContainerItem::KWalletContainerItem(TQListViewItem* parent, const TQString &name, KWallet::Wallet::EntryType type) +: KListViewItem(parent, name), _type(type) { setRenameEnabled(0, false); setDragEnabled(true); } @@ -154,8 +154,8 @@ TQListViewItem *KWalletContainerItem::getItem(const TQString& key) { /**************** * KWalletEntryItem - ListView items to represent kwallet entries */ -KWalletEntryItem::KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* tqparent, const TQString& ename) -: KListViewItem(tqparent, ename), _wallet(w), _oldName(ename) { +KWalletEntryItem::KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename) +: KListViewItem(parent, ename), _wallet(w), _oldName(ename) { setRenameEnabled(0, true); setDragEnabled(true); } @@ -170,8 +170,8 @@ KWalletEntryItem::~KWalletEntryItem() { /**************** * KWalletItem - IconView items to represent wallets */ -KWalletItem::KWalletItem(TQIconView *tqparent, const TQString& walletName) -: TQIconViewItem(tqparent, walletName, DesktopIcon("kwalletmanager")) { +KWalletItem::KWalletItem(TQIconView *parent, const TQString& walletName) +: TQIconViewItem(parent, walletName, DesktopIcon("kwalletmanager")) { } KWalletItem::~KWalletItem() { @@ -300,12 +300,12 @@ void KWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& lst //delete the folder from the source if we were moving TQt::ButtonState state = kapp->keyboardMouseState(); - if (e->source() && e->source()->tqparent() && - !strcmp(e->source()->tqparent()->className(), "KWalletEntryList") && + if (e->source() && e->source()->parent() && + !strcmp(e->source()->parent()->className(), "KWalletEntryList") && !(state & TQt::ControlButton)) { KWalletEntryList *el = - dynamic_cast<KWalletEntryList*>(e->source()->tqparent()); + dynamic_cast<KWalletEntryList*>(e->source()->parent()); if (el) { KWalletFolderItem *fi = dynamic_cast<KWalletFolderItem*>(el->selectedItem()); @@ -348,8 +348,8 @@ class KWalletFolderDrag : public TQStoredDrag { /**************** * KWalletEntryList - A listview to store wallet entries */ -KWalletEntryList::KWalletEntryList(TQWidget *tqparent, const char *name) -: KListView(tqparent, name) { +KWalletEntryList::KWalletEntryList(TQWidget *parent, const char *name) +: KListView(parent, name) { addColumn(i18n("Folders")); setRootIsDecorated(true); setDefaultRenameAction(Reject); @@ -389,10 +389,10 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) { TQListViewItem *sel = 0L; //detect if we are dragging from kwallet itself - if (e->source() && e->source()->tqparent() && - !strcmp(e->source()->tqparent()->className(), "KWalletEntryList")) { + if (e->source() && e->source()->parent() && + !strcmp(e->source()->parent()->className(), "KWalletEntryList")) { - el = dynamic_cast<KWalletEntryList*>(e->source()->tqparent()); + el = dynamic_cast<KWalletEntryList*>(e->source()->parent()); if (!el) { KMessageBox::error(this, i18n("An unexpected error occurred trying to drop the item")); } else @@ -401,7 +401,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) { if (e->provides("application/x-kwallet-entry")) { //do nothing if we are in the same folder - if (sel && sel->tqparent()->tqparent() == + if (sel && sel->parent()->parent() == KWalletEntryList::getItemFolder(item)) { e->ignore(); return; @@ -562,9 +562,9 @@ KWalletFolderItem *KWalletEntryList::getItemFolder(TQListViewItem *item) { case KWalletFolderItemClass: return dynamic_cast<KWalletFolderItem *>(item); case KWalletContainerItemClass: - return dynamic_cast<KWalletFolderItem *>(item->tqparent()); + return dynamic_cast<KWalletFolderItem *>(item->parent()); case KWalletEntryItemClass: - return dynamic_cast<KWalletFolderItem *>(item->tqparent()->tqparent()); + return dynamic_cast<KWalletFolderItem *>(item->parent()->parent()); } return 0; } @@ -618,8 +618,8 @@ class KWalletIconDrag : public TQIconDrag { /**************** * * KWalletIconView - An iconview to store wallets * */ -KWalletIconView::KWalletIconView(TQWidget *tqparent, const char *name) -: KIconView(tqparent, name) { +KWalletIconView::KWalletIconView(TQWidget *parent, const char *name) +: KIconView(parent, name) { KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), TQT_SLOT(slotDropped(TQDropEvent*, const TQValueList<TQIconDragItem>&))); } diff --git a/kwallet/allyourbase.h b/kwallet/allyourbase.h index 17f92a5..d7bb391 100644 --- a/kwallet/allyourbase.h +++ b/kwallet/allyourbase.h @@ -39,7 +39,7 @@ enum KWalletListItemClasses { class KWalletEntryItem : public KListViewItem { public: - KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* tqparent, const TQString& ename); + KWalletEntryItem(KWallet::Wallet *w, TQListViewItem* parent, const TQString& ename); virtual ~KWalletEntryItem(); const TQString& oldName() { return _oldName; } @@ -57,7 +57,7 @@ class KWalletEntryItem : public KListViewItem { class KWalletContainerItem : public KListViewItem { public: - KWalletContainerItem(TQListViewItem* tqparent, const TQString& name, + KWalletContainerItem(TQListViewItem* parent, const TQString& name, KWallet::Wallet::EntryType type); virtual ~KWalletContainerItem(); @@ -73,7 +73,7 @@ class KWalletContainerItem : public KListViewItem { class KWalletFolderItem : public KListViewItem { public: - KWalletFolderItem(KWallet::Wallet *w, TQListView* tqparent, + KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, const TQString& name, int entries); virtual ~KWalletFolderItem(); @@ -99,7 +99,7 @@ class KWalletEntryList : public KListView { Q_OBJECT TQ_OBJECT public: - KWalletEntryList(TQWidget *tqparent, const char *name = 0L); + KWalletEntryList(TQWidget *parent, const char *name = 0L); virtual ~KWalletEntryList(); bool existsFolder(const TQString& name); @@ -122,7 +122,7 @@ class KWalletEntryList : public KListView { class KWalletItem : public TQIconViewItem { public: - KWalletItem(TQIconView *tqparent, const TQString& walletName); + KWalletItem(TQIconView *parent, const TQString& walletName); virtual ~KWalletItem(); virtual bool acceptDrop(const TQMimeSource *mime) const; @@ -136,7 +136,7 @@ class KWalletIconView : public KIconView { Q_OBJECT TQ_OBJECT public: - KWalletIconView(TQWidget *tqparent, const char *name = 0L); + KWalletIconView(TQWidget *parent, const char *name = 0L); virtual ~KWalletIconView(); protected slots: diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp index aeffa55..fd058ad 100644 --- a/kwallet/konfigurator/konfigurator.cpp +++ b/kwallet/konfigurator/konfigurator.cpp @@ -40,8 +40,8 @@ typedef KGenericFactory<KWalletConfig, TQWidget> KWalletFactory; K_EXPORT_COMPONENT_FACTORY(kcm_kwallet, KWalletFactory("kcmkwallet")) -KWalletConfig::KWalletConfig(TQWidget *tqparent, const char *name, const TQStringList&) -: KCModule(KWalletFactory::instance(), tqparent, name) { +KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringList&) +: KCModule(KWalletFactory::instance(), parent, name) { KAboutData *about = new KAboutData(I18N_NOOP("kcmkwallet"), @@ -302,9 +302,9 @@ TQString KWalletConfig::quickHelp() const { void KWalletConfig::contextMenuRequested(TQListViewItem *item, const TQPoint& pos, int col) { Q_UNUSED(col) - if (item && item->tqparent()) { + if (item && item->parent()) { KPopupMenu *m = new KPopupMenu(this); - m->insertTitle(item->tqparent()->text(0)); + m->insertTitle(item->parent()->text(0)); m->insertItem(i18n("&Delete"), this, TQT_SLOT(deleteEntry()), Key_Delete); m->popup(pos); } diff --git a/kwallet/konfigurator/konfigurator.h b/kwallet/konfigurator/konfigurator.h index 63ba608..2c62842 100644 --- a/kwallet/konfigurator/konfigurator.h +++ b/kwallet/konfigurator/konfigurator.h @@ -30,7 +30,7 @@ class KWalletConfig : public KCModule { Q_OBJECT TQ_OBJECT public: - KWalletConfig(TQWidget *tqparent = 0L, const char *name = 0L, const TQStringList& = TQStringList()); + KWalletConfig(TQWidget *parent = 0L, const char *name = 0L, const TQStringList& = TQStringList()); virtual ~KWalletConfig(); void load(); diff --git a/kwallet/kwalleteditor.cpp b/kwallet/kwalleteditor.cpp index 5ab1f8f..e79610f 100644 --- a/kwallet/kwalleteditor.cpp +++ b/kwallet/kwalleteditor.cpp @@ -62,8 +62,8 @@ #include <assert.h> #include <stdlib.h> -KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *tqparent, const char *name) -: KMainWindow(tqparent, name), _walletName(wallet), _nonLocal(isPath) { +KWalletEditor::KWalletEditor(const TQString& wallet, bool isPath, TQWidget *parent, const char *name) +: KMainWindow(parent, name), _walletName(wallet), _nonLocal(isPath) { _newWallet = false; _ww = new WalletWidget(this, "Wallet Widget"); _copyPassAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copyPassword()), actionCollection()); @@ -348,8 +348,8 @@ void KWalletEditor::saveEntry() { _ww->_saveChanges->setEnabled(false); _ww->_undoChanges->setEnabled(false); - if (item && _w && item->tqparent()) { - KWalletContainerItem *ci = dynamic_cast<KWalletContainerItem*>(item->tqparent()); + if (item && _w && item->parent()) { + KWalletContainerItem *ci = dynamic_cast<KWalletContainerItem*>(item->parent()); if (ci) { if (ci->type() == KWallet::Wallet::Password) { rc = _w->writePassword(item->text(0), _ww->_passwordValue->text()); @@ -387,11 +387,11 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) { switch (item->rtti()) { case KWalletEntryItemClass: - ci = dynamic_cast<KWalletContainerItem*>(item->tqparent()); + ci = dynamic_cast<KWalletContainerItem*>(item->parent()); if (!ci) { return; } - fi = dynamic_cast<KWalletFolderItem*>(ci->tqparent()); + fi = dynamic_cast<KWalletFolderItem*>(ci->parent()); if (!fi) { return; } @@ -430,7 +430,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) { break; case KWalletContainerItemClass: - fi = dynamic_cast<KWalletFolderItem*>(item->tqparent()); + fi = dynamic_cast<KWalletFolderItem*>(item->parent()); if (!fi) { return; } @@ -560,7 +560,7 @@ void KWalletEditor::listContextMenuRequested(TQListViewItem *item, const TQPoint if (item) { if (item->rtti() == KWalletEntryItemClass) { - ci = dynamic_cast<KWalletContainerItem *>(item->tqparent()); + ci = dynamic_cast<KWalletContainerItem *>(item->parent()); if (!ci) { return; } @@ -635,9 +635,9 @@ void KWalletEditor::newEntry() { if (_w && item) { p = item; if (p->rtti() == KWalletEntryItemClass) { - p = item->tqparent(); + p = item->parent(); } - fi = dynamic_cast<KWalletFolderItem *>(p->tqparent()); + fi = dynamic_cast<KWalletFolderItem *>(p->parent()); if (!fi) { return; } @@ -671,10 +671,10 @@ void KWalletEditor::newEntry() { if (_w && item && !n.isEmpty()) { TQListViewItem *p = item; if (p->rtti() == KWalletEntryItemClass) { - p = item->tqparent(); + p = item->parent(); } - KWalletFolderItem *fi = dynamic_cast<KWalletFolderItem *>(p->tqparent()); + KWalletFolderItem *fi = dynamic_cast<KWalletFolderItem *>(p->parent()); if (!fi) { KMessageBox::error(this, i18n("An unexpected error occurred trying to add the new entry")); return; @@ -728,7 +728,7 @@ void KWalletEditor::listItemRenamed(TQListViewItem* item, int, const TQString& t if (_w->renameEntry(i->oldName(), t) == 0) { i->clearOldName(); - KWalletContainerItem *ci = dynamic_cast<KWalletContainerItem*>(item->tqparent()); + KWalletContainerItem *ci = dynamic_cast<KWalletContainerItem*>(item->parent()); if (!ci) { KMessageBox::error(this, i18n("An unexpected error occurred trying to rename the entry")); return; @@ -752,7 +752,7 @@ void KWalletEditor::deleteEntry() { if (_w && item) { 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->tqparent()->tqparent()); + KWalletFolderItem *fi = dynamic_cast<KWalletFolderItem *>(item->parent()->parent()); if (!fi) { KMessageBox::error(this, i18n("An unexpected error occurred trying to delete the entry")); return; diff --git a/kwallet/kwalleteditor.h b/kwallet/kwalleteditor.h index 7d4fe86..02f1342 100644 --- a/kwallet/kwalleteditor.h +++ b/kwallet/kwalleteditor.h @@ -39,7 +39,7 @@ class KWalletEditor : public KMainWindow { TQ_OBJECT public: - KWalletEditor(const TQString& wallet, bool isPath, TQWidget *tqparent = 0, const char* name = 0); + KWalletEditor(const TQString& wallet, bool isPath, TQWidget *parent = 0, const char* name = 0); virtual ~KWalletEditor(); bool isOpen() const { return _w != 0L; } diff --git a/kwallet/kwalletmanager.cpp b/kwallet/kwalletmanager.cpp index 9a85df8..d65dcd2 100644 --- a/kwallet/kwalletmanager.cpp +++ b/kwallet/kwalletmanager.cpp @@ -46,8 +46,8 @@ #include <tqtimer.h> #include <tqtooltip.h> -KWalletManager::KWalletManager(TQWidget *tqparent, const char *name, WFlags f) -: KMainWindow(tqparent, name, f), DCOPObject("KWalletManager") { +KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f) +: KMainWindow(parent, name, f), DCOPObject("KWalletManager") { KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); _kwalletdLaunch = false; TQAccel *accel = new TQAccel(this, "kwalletmanager"); diff --git a/kwallet/kwalletmanager.h b/kwallet/kwalletmanager.h index 922da8f..acb8006 100644 --- a/kwallet/kwalletmanager.h +++ b/kwallet/kwalletmanager.h @@ -36,7 +36,7 @@ class KWalletManager : public KMainWindow, public DCOPObject { K_DCOP public: - KWalletManager(TQWidget *tqparent = 0, const char* name = 0, WFlags f = 0); + KWalletManager(TQWidget *parent = 0, const char* name = 0, WFlags f = 0); virtual ~KWalletManager(); TQPixmap loadSystemTrayIcon(const TQString &icon); diff --git a/kwallet/kwalletpopup.cpp b/kwallet/kwalletpopup.cpp index 592c10e..032ec8a 100644 --- a/kwallet/kwalletpopup.cpp +++ b/kwallet/kwalletpopup.cpp @@ -28,8 +28,8 @@ #include <kwallet.h> #include <kstdguiitem.h> -KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *tqparent, const char *name) -: KPopupMenu(tqparent, name), _walletName(wallet) { +KWalletPopup::KWalletPopup(const TQString& wallet, TQWidget *parent, const char *name) +: KPopupMenu(parent, name), _walletName(wallet) { insertTitle(wallet); KActionCollection *ac = new KActionCollection(this, "kwallet context actions"); KAction *act; diff --git a/kwallet/kwalletpopup.h b/kwallet/kwalletpopup.h index 3d5d83c..ce35669 100644 --- a/kwallet/kwalletpopup.h +++ b/kwallet/kwalletpopup.h @@ -29,7 +29,7 @@ class KWalletPopup : public KPopupMenu { TQ_OBJECT public: - KWalletPopup(const TQString& wallet, TQWidget *tqparent = 0, const char* name = 0); + KWalletPopup(const TQString& wallet, TQWidget *parent = 0, const char* name = 0); virtual ~KWalletPopup(); public slots: diff --git a/kwallet/kwmapeditor.cpp b/kwallet/kwmapeditor.cpp index 302540e..fd53723 100644 --- a/kwallet/kwmapeditor.cpp +++ b/kwallet/kwmapeditor.cpp @@ -31,8 +31,8 @@ #include <tqpushbutton.h> #include <tqtextedit.h> -KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *tqparent, const char *name) -: TQTable(0, 3, tqparent, name), _map(map) { +KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent, const char *name) +: TQTable(0, 3, parent, name), _map(map) { _ac = new KActionCollection(this); _copyAct = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), _ac); connect(this, TQT_SIGNAL(valueChanged(int,int)), this, TQT_SIGNAL(dirty())); diff --git a/kwallet/kwmapeditor.h b/kwallet/kwmapeditor.h index 3b434af..fc34cbc 100644 --- a/kwallet/kwmapeditor.h +++ b/kwallet/kwmapeditor.h @@ -32,7 +32,7 @@ class KWMapEditor : public TQTable { TQ_OBJECT public: - KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *tqparent = 0, const char *name = 0); + KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent = 0, const char *name = 0); virtual ~KWMapEditor(); public slots: diff --git a/superkaramba/examples/api.html b/superkaramba/examples/api.html index 14c2263..132544a 100644 --- a/superkaramba/examples/api.html +++ b/superkaramba/examples/api.html @@ -165,7 +165,7 @@ Widget/createWidgetMask</a></h2> <p>[<a href="#robo_top_of_doc">top</a>]</p> <p><strong>SYNOPSIS</strong></p> -<span class="SYNOPSIS"><p> long <strong>createWidgetMask</strong>(widget, tqmask) +<span class="SYNOPSIS"><p> long <strong>createWidgetMask</strong>(widget, mask) </p> </span><p><strong>DESCRIPTION</strong></p> <span class="DESCRIPTION"><p> This function doesn't work currently due to a bug in KDE. Please use @@ -174,7 +174,7 @@ Widget/createWidgetMask</a></h2> </span><p><strong>ARGUMENTS</strong></p> <span class="ARGUMENTS"><ul><li> long widget -- karamba </li> -<li> string tqmask -- The name of the widget tqmask file. +<li> string mask -- The name of the widget mask file. </li> </ul> <p></p> @@ -2096,7 +2096,7 @@ Misc/translateAll</a></h2> </p> </span><p><strong>DESCRIPTION</strong></p> <span class="DESCRIPTION"><p> Moves all widgets within a theme in a particular direction relative from - the previous spot without moving the tqparent theme widget. + the previous spot without moving the parent theme widget. </p> </span><p><strong>ARGUMENTS</strong></p> <span class="ARGUMENTS"><ul><li> long widget -- karamba diff --git a/superkaramba/examples/globalMouse/eyes.py b/superkaramba/examples/globalMouse/eyes.py index 64bc3e0..b95f86d 100644 --- a/superkaramba/examples/globalMouse/eyes.py +++ b/superkaramba/examples/globalMouse/eyes.py @@ -108,7 +108,7 @@ def widgetUpdated(widget): #f.close() - #karamba.createWidgetMask(widget, theme_path + "pics/tqmask.png") + #karamba.createWidgetMask(widget, theme_path + "pics/mask.png") linkePupille = karamba.createImage(widget, 15, 30, theme_path + "pics/pupille.png") rechtePupille = karamba.createImage(widget, 100, 30, theme_path + "pics/pupille.png") diff --git a/superkaramba/examples/globalMouse/eyes.theme b/superkaramba/examples/globalMouse/eyes.theme index ffdff73..4f2417b 100644 --- a/superkaramba/examples/globalMouse/eyes.theme +++ b/superkaramba/examples/globalMouse/eyes.theme @@ -1,3 +1,3 @@ -KARAMBA X=5 Y=850 W=167 H=111 MASK="pics/tqmask.png" LOCKED=false INTERVAL=100 +KARAMBA X=5 Y=850 W=167 H=111 MASK="pics/mask.png" LOCKED=false INTERVAL=100 IMAGE X=0 Y=0 PATH="pics/eyes.png" diff --git a/superkaramba/src/datesensor.cpp b/superkaramba/src/datesensor.cpp index 9db258f..56c9d31 100644 --- a/superkaramba/src/datesensor.cpp +++ b/superkaramba/src/datesensor.cpp @@ -48,8 +48,8 @@ void DateSensor::slotCalendarDeleted() } -DatePicker::DatePicker(TQWidget *tqparent) - : TQVBox( tqparent, 0, WType_TopLevel | WDestructiveClose | +DatePicker::DatePicker(TQWidget *parent) + : TQVBox( parent, 0, WType_TopLevel | WDestructiveClose | WStyle_Customize | WStyle_StaysOnTop | WStyle_NoBorder ) { setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp index ca6e2cc..5965355 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -1992,8 +1992,8 @@ void karamba::toggleWidgetUpdate( bool b) widgetUpdate = b; } -SignalBridge::SignalBridge(TQObject* tqparent, TQString name, KActionCollection* ac) - : TQObject(tqparent, name.ascii()), collection(ac) +SignalBridge::SignalBridge(TQObject* parent, TQString name, KActionCollection* ac) + : TQObject(parent, name.ascii()), collection(ac) { setName(name.ascii()); } @@ -2004,15 +2004,15 @@ void SignalBridge::receive() isChecked()); } -DesktopChangeSlot::DesktopChangeSlot(TQObject *tqparent, int id) - : TQObject(tqparent, "") +DesktopChangeSlot::DesktopChangeSlot(TQObject *parent, int id) + : TQObject(parent, "") { desktopid = id; } void DesktopChangeSlot::receive() { - karamba *k = (karamba *)tqparent(); + karamba *k = (karamba *)parent(); // XXX - check type cast diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h index 7184f4c..a8088ff 100644 --- a/superkaramba/src/karamba.h +++ b/superkaramba/src/karamba.h @@ -330,7 +330,7 @@ class DesktopChangeSlot : public TQObject TQ_OBJECT public: - DesktopChangeSlot(TQObject *tqparent, int desktop_id); + DesktopChangeSlot(TQObject *parent, int desktop_id); /* Parent should be the karamba object * desktop id of 0 indicates all desktops */ void setMenuId(int id); @@ -351,7 +351,7 @@ class SignalBridge : public TQObject TQ_OBJECT public: - SignalBridge(TQObject* tqparent, TQString, KActionCollection*); + SignalBridge(TQObject* parent, TQString, KActionCollection*); signals: void enabled(TQString, bool); diff --git a/superkaramba/src/karamba_python.cpp b/superkaramba/src/karamba_python.cpp index 7f865d9..1538672 100644 --- a/superkaramba/src/karamba_python.cpp +++ b/superkaramba/src/karamba_python.cpp @@ -194,7 +194,7 @@ static PyMethodDef karamba_methods[] = { // Widget - widget_python.cpp {(char*)"moveWidget", py_move_widget, METH_VARARGS, (char*)"Move Widget to x,y"}, {(char*)"resizeWidget", py_resize_widget, METH_VARARGS, (char*)"Resize Widget to width,height"}, - {(char*)"createWidgetMask", py_create_widget_tqmask, METH_VARARGS, (char*)"Create a clipping tqmask for this widget"}, + {(char*)"createWidgetMask", py_create_widget_mask, METH_VARARGS, (char*)"Create a clipping mask for this widget"}, {(char*)"redrawWidget", py_redraw_widget, METH_VARARGS, (char*)"Update Widget to reflect your changes"}, {(char*)"redrawWidgetBackground", py_redraw_widget_background, METH_VARARGS, (char*)"Update Widget to reflect background image changes"}, {(char*)"getWidgetPosition", py_get_widget_position, METH_VARARGS, (char*)"Get Widget Position"}, diff --git a/superkaramba/src/kwidgetlistbox.cpp b/superkaramba/src/kwidgetlistbox.cpp index bca1deb..d22d3c8 100644 --- a/superkaramba/src/kwidgetlistbox.cpp +++ b/superkaramba/src/kwidgetlistbox.cpp @@ -21,8 +21,8 @@ #include <kdebug.h> #include <kglobalsettings.h> -KWidgetListbox::KWidgetListbox(TQWidget *tqparent, const char *name) - : TQTable(tqparent, name) +KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name) + : TQTable(parent, name) { setNumRows(0); setNumCols(1); diff --git a/superkaramba/src/kwidgetlistbox.h b/superkaramba/src/kwidgetlistbox.h index 78f899e..b1e4b25 100644 --- a/superkaramba/src/kwidgetlistbox.h +++ b/superkaramba/src/kwidgetlistbox.h @@ -34,7 +34,7 @@ class KWidgetListbox : public TQTable TQ_OBJECT public: - KWidgetListbox(TQWidget *tqparent = 0, const char *name = 0); + KWidgetListbox(TQWidget *parent = 0, const char *name = 0); ~KWidgetListbox(); int insertItem(TQWidget* item, int index = -1); diff --git a/superkaramba/src/misc_python.h b/superkaramba/src/misc_python.h index 9b89f60..46c0988 100644 --- a/superkaramba/src/misc_python.h +++ b/superkaramba/src/misc_python.h @@ -316,7 +316,7 @@ PyObject* py_get_number_of_desktops(PyObject *self, PyObject *args); * long translateAll(widget, relative_x, relative_y) * DESCRIPTION * Moves all widgets within a theme in a particular direction relative to -* the previous spot without moving the tqparent theme widget. +* the previous spot without moving the parent theme widget. * ARGUMENTS * * long widget -- karamba * * long translate_x -- move horizontally diff --git a/superkaramba/src/sklineedit.cpp b/superkaramba/src/sklineedit.cpp index f923fef..40b6d3e 100644 --- a/superkaramba/src/sklineedit.cpp +++ b/superkaramba/src/sklineedit.cpp @@ -66,7 +66,7 @@ void SKLineEdit::keyPressEvent(TQKeyEvent* e) if(!e->text().isEmpty()) { - karamba* k = static_cast<karamba*>(TQT_TQWIDGET(tqparent())); + karamba* k = static_cast<karamba*>(TQT_TQWIDGET(parent())); k->keyPressed(e->text(), m_input); } } diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp index e5268fb..fbd4625 100644 --- a/superkaramba/src/systemtray.cpp +++ b/superkaramba/src/systemtray.cpp @@ -35,8 +35,8 @@ #include <X11/Xlib.h> -Systemtray::Systemtray(TQWidget* tqparent) - : TQWidget(tqparent,0,0) +Systemtray::Systemtray(TQWidget* parent) + : TQWidget(parent,0,0) { setBackgroundOrigin(ParentOrigin); setBackgroundMode(FixedPixmap); diff --git a/superkaramba/src/systemtray.h b/superkaramba/src/systemtray.h index 02870a8..7ff60ac 100644 --- a/superkaramba/src/systemtray.h +++ b/superkaramba/src/systemtray.h @@ -36,7 +36,7 @@ class Systemtray : public TQWidget Q_OBJECT TQ_OBJECT public: - Systemtray(TQWidget* tqparent); + Systemtray(TQWidget* parent); ~Systemtray(); void updateBackgroundPixmap ( const TQPixmap & ); diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index 90f0efe..26a417e 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. template class TQPtrList<Task>; -// Hack: create a global KWinModule without a tqparent. We +// Hack: create a global KWinModule without a parent. We // can't make it a child of TaskManager because more than one // TaskManager might be created. We can't make it a class // variable without changing Task, which also uses it. @@ -48,8 +48,8 @@ template class TQPtrList<Task>; // The real problem is that KWinModule should be a singleton. KWinModule* kwin_module = 0; -TaskManager::TaskManager(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), _active(0), _startup_info( NULL ) +TaskManager::TaskManager(TQObject *parent, const char *name) + : TQObject(parent, name), _active(0), _startup_info( NULL ) { kwin_module = new KWinModule(); @@ -328,8 +328,8 @@ bool TaskManager::isOnTop(const Task* task) } -Task::Task(WId win, TaskManager * tqparent, const char *name) : - TQObject(tqparent, name), +Task::Task(WId win, TaskManager * parent, const char *name) : + TQObject(parent, name), _active(false), _win(win), _lastWidth(0), _lastHeight(0), _lastResize(false), _lastIcon(), _thumbSize(0.2), _thumb(), _grab() @@ -803,8 +803,8 @@ void Task::generateThumbnail() } Startup::Startup( const KStartupInfoId& id, const KStartupInfoData& data, - TQObject * tqparent, const char *name) - : TQObject(tqparent, name), _id( id ), _data( data ) + TQObject * parent, const char *name) + : TQObject(parent, name), _id( id ), _data( data ) { } diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h index 70cff97..0daac31 100644 --- a/superkaramba/src/taskmanager.h +++ b/superkaramba/src/taskmanager.h @@ -70,10 +70,10 @@ class Task: public TQObject TQ_PROPERTY( TQPixmap thumbnail READ thumbnail ) public: - Task( WId win, TaskManager * tqparent, const char *name = 0 ); + Task( WId win, TaskManager * parent, const char *name = 0 ); virtual ~Task(); - TaskManager* taskManager() const { return (TaskManager*) tqparent(); } + TaskManager* taskManager() const { return (TaskManager*) parent(); } WId window() const { return _win; } #ifdef KDE_3_2 @@ -382,7 +382,7 @@ class Startup: public TQObject TQ_PROPERTY( TQString icon READ icon ) public: - Startup( const KStartupInfoId& id, const KStartupInfoData& data, TQObject * tqparent, + Startup( const KStartupInfoId& id, const KStartupInfoData& data, TQObject * parent, const char *name = 0); virtual ~Startup(); @@ -437,7 +437,7 @@ class TaskManager : public TQObject TQ_PROPERTY( int numberOfDesktops READ numberOfDesktops ) public: - TaskManager( TQObject *tqparent = 0, const char *name = 0 ); + TaskManager( TQObject *parent = 0, const char *name = 0 ); virtual ~TaskManager(); /** diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp index bf4cd93..555ad48 100644 --- a/superkaramba/src/themesdlg.cpp +++ b/superkaramba/src/themesdlg.cpp @@ -51,8 +51,8 @@ #include <kio/job.h> #include <kprotocolinfo.h> -ThemesDlg::ThemesDlg(TQWidget *tqparent, const char *name) - : ThemesLayout(tqparent, name) +ThemesDlg::ThemesDlg(TQWidget *parent, const char *name) + : ThemesLayout(parent, name) { populateListbox(); #ifdef HAVE_KNEWSTUFF diff --git a/superkaramba/src/themesdlg.h b/superkaramba/src/themesdlg.h index 200dca2..bf4fab5 100644 --- a/superkaramba/src/themesdlg.h +++ b/superkaramba/src/themesdlg.h @@ -43,7 +43,7 @@ class ThemesDlg : public ThemesLayout TQ_OBJECT public: - ThemesDlg(TQWidget *tqparent = 0, const char *name = 0); + ThemesDlg(TQWidget *parent = 0, const char *name = 0); ~ThemesDlg(); int addTheme(const TQString &appId, const TQString &file); diff --git a/superkaramba/src/themewidget.cpp b/superkaramba/src/themewidget.cpp index 8eab4d0..3addd2a 100644 --- a/superkaramba/src/themewidget.cpp +++ b/superkaramba/src/themewidget.cpp @@ -25,8 +25,8 @@ #include <tqlabel.h> #include <tqlayout.h> -ThemeWidget::ThemeWidget(TQWidget *tqparent, const char *name) - : ThemeWidgetLayout(tqparent, name), m_themeFile(0) +ThemeWidget::ThemeWidget(TQWidget *parent, const char *name) + : ThemeWidgetLayout(parent, name), m_themeFile(0) { running->setText(""); setDescriptionMaxHeight(); diff --git a/superkaramba/src/themewidget.h b/superkaramba/src/themewidget.h index 10e557d..40cefe5 100644 --- a/superkaramba/src/themewidget.h +++ b/superkaramba/src/themewidget.h @@ -32,7 +32,7 @@ class ThemeWidget : public ThemeWidgetLayout Q_OBJECT TQ_OBJECT public: - ThemeWidget(TQWidget *tqparent = 0, const char *name = 0); + ThemeWidget(TQWidget *parent = 0, const char *name = 0); ThemeWidget(ThemeFile* tf); ~ThemeWidget(); diff --git a/superkaramba/src/widget_python.cpp b/superkaramba/src/widget_python.cpp index ad545f3..564b4b4 100644 --- a/superkaramba/src/widget_python.cpp +++ b/superkaramba/src/widget_python.cpp @@ -86,7 +86,7 @@ long createWidgetMask(long widget, char* path) return (long)currTheme->widgetMask; } -PyObject* py_create_widget_tqmask(PyObject *, PyObject *args) +PyObject* py_create_widget_mask(PyObject *, PyObject *args) { long widget; char *text; diff --git a/superkaramba/src/widget_python.h b/superkaramba/src/widget_python.h index e54c31d..97cc263 100644 --- a/superkaramba/src/widget_python.h +++ b/superkaramba/src/widget_python.h @@ -42,17 +42,17 @@ PyObject* py_get_widget_position(PyObject *self, PyObject *args); /** Widget/createWidgetMask * * SYNOPSIS -* long createWidgetMask(widget, tqmask) +* long createWidgetMask(widget, mask) * DESCRIPTION * This function doesn't work currently due to a bug in KDE. Please use * MASK= in your .theme file for the time being. * ARGUMENTS * * long widget -- karamba -* * string tqmask -- The name of the widget tqmask file. +* * string mask -- The name of the widget mask file. * RETURN VALUE * 1 if successful */ -PyObject* py_create_widget_tqmask(PyObject *self, PyObject *args); +PyObject* py_create_widget_mask(PyObject *self, PyObject *args); /** Widget/redrawWidgetBackground * |