diff options
209 files changed, 1050 insertions, 1105 deletions
diff --git a/.gitmodules b/.gitmodules index bdec8fc..934def7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "admin"] path = admin url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin -[submodule "cmake"] - path = cmake - url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 509e50e..3ffb374 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,12 +9,15 @@ # ################################################# -cmake_minimum_required( VERSION 2.8 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEL10n ) diff --git a/CMakeLists.txt b/CMakeLists.txt index e22655b..1bb7a5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,13 +6,17 @@ # ############################################### -cmake_minimum_required( VERSION 2.8.12 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) #### general package setup project( tdeadmin ) -set( VERSION R14.0.4 ) #### include essential cmake modules @@ -28,7 +32,6 @@ include( CheckCXXSourceCompiles ) #### include our cmake modules -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEMacros ) diff --git a/admin b/admin -Subproject 8c7e0d40de084fe5d54e173918756639e0d4d63 +Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7 diff --git a/cmake b/cmake deleted file mode 160000 -Subproject 111a08942a8b5452cd51f41e6f811d55de30c65 diff --git a/kcron/ktapp.cpp b/kcron/ktapp.cpp index 6db4cb3..22d92dc 100644 --- a/kcron/ktapp.cpp +++ b/kcron/ktapp.cpp @@ -59,8 +59,8 @@ KTApp::KTApp() : TDEMainWindow(0) TDEPopupMenu *editMenu = static_cast<TDEPopupMenu*>(guiFactory()->container("edit", this)); TDEPopupMenu *settingsMenu = static_cast<TDEPopupMenu*>(guiFactory()->container("settings", this)); - connect(editMenu,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(statusEditCallback(int))); - connect(settingsMenu,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(statusSettingsCallback(int))); + connect(editMenu,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(statusEditCallback(int))); + connect(settingsMenu,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(statusSettingsCallback(int))); // Read options. readOptions(); } @@ -120,24 +120,24 @@ TQString KTApp::caption() void KTApp::setupActions() { //File Menu - KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); - KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); + KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); + KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); //Edit menu - KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); - KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); - KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); - (void)new TDEAction(i18n("&New..."), TDEStdAccel::openNew(), TQT_TQOBJECT(this),TQT_SLOT(slotEditNew()),actionCollection(),"edit_new"); + KStdAction::cut(this, TQ_SLOT(slotEditCut()), actionCollection()); + KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); + KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); + (void)new TDEAction(i18n("&New..."), TDEStdAccel::openNew(), this,TQ_SLOT(slotEditNew()),actionCollection(),"edit_new"); //I don't like this TDEStdAccel::open() for modifying, but I'm just porting this to xmlui - (void)new TDEAction(i18n("M&odify..."), TDEStdAccel::open(), TQT_TQOBJECT(this),TQT_SLOT(slotEditModify()),actionCollection(),"edit_modify"); - (void)new TDEAction(i18n("&Delete"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditDelete()),actionCollection(),"edit_delete"); - (void)new TDEAction(i18n("&Enabled"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditEnable()),actionCollection(),"edit_enable"); - (void)new TDEAction(i18n("&Run Now"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotEditRunNow()),actionCollection(),"edit_run"); + (void)new TDEAction(i18n("M&odify..."), TDEStdAccel::open(), this,TQ_SLOT(slotEditModify()),actionCollection(),"edit_modify"); + (void)new TDEAction(i18n("&Delete"), 0, this,TQ_SLOT(slotEditDelete()),actionCollection(),"edit_delete"); + (void)new TDEAction(i18n("&Enabled"), 0, this,TQ_SLOT(slotEditEnable()),actionCollection(),"edit_enable"); + (void)new TDEAction(i18n("&Run Now"), 0, this,TQ_SLOT(slotEditRunNow()),actionCollection(),"edit_run"); //Settings menu - (void)new TDEAction(i18n("Show &Toolbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewToolBar()),actionCollection(),"show_toolbar"); - (void)new TDEAction(i18n("Show &Statusbar"), 0, TQT_TQOBJECT(this),TQT_SLOT(slotViewStatusBar()),actionCollection(),"show_statusbar"); + (void)new TDEAction(i18n("Show &Toolbar"), 0, this,TQ_SLOT(slotViewToolBar()),actionCollection(),"show_toolbar"); + (void)new TDEAction(i18n("Show &Statusbar"), 0, this,TQ_SLOT(slotViewStatusBar()),actionCollection(),"show_statusbar"); } diff --git a/kcron/ktapp.h b/kcron/ktapp.h index f133291..775d8d2 100644 --- a/kcron/ktapp.h +++ b/kcron/ktapp.h @@ -33,7 +33,7 @@ class CTHost; */ class KTApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT friend class KTView; diff --git a/kcron/ktprintopt.h b/kcron/ktprintopt.h index 60ace3f..9d6cef5 100644 --- a/kcron/ktprintopt.h +++ b/kcron/ktprintopt.h @@ -30,7 +30,7 @@ class TDEAccel; class KTPrintOpt : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp index b0e3cce..34d7ce1 100644 --- a/kcron/kttask.cpp +++ b/kcron/kttask.cpp @@ -365,42 +365,42 @@ KTTask::KTTask(CTTask* _cttask, const TQString & _caption) } // connect them up - connect(pbBrowse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse())); - connect(leCommand, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotCommandChanged())); - connect(cbEveryDay, TQT_SIGNAL(clicked()), TQT_SLOT(slotDailyChanged())); - connect(pbOk, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK())); - connect(pbCancel, TQT_SIGNAL(clicked()), TQT_SLOT(slotCancel())); - connect(pbAllMonths, TQT_SIGNAL(clicked()), TQT_SLOT(slotAllMonths())); + connect(pbBrowse, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowse())); + connect(leCommand, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotCommandChanged())); + connect(cbEveryDay, TQ_SIGNAL(clicked()), TQ_SLOT(slotDailyChanged())); + connect(pbOk, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK())); + connect(pbCancel, TQ_SIGNAL(clicked()), TQ_SLOT(slotCancel())); + connect(pbAllMonths, TQ_SIGNAL(clicked()), TQ_SLOT(slotAllMonths())); for (int mo = 1; mo <= 12; mo++) { - connect(cbMonth[mo], TQT_SIGNAL(clicked()), TQT_SLOT(slotMonthChanged())); + connect(cbMonth[mo], TQ_SIGNAL(clicked()), TQ_SLOT(slotMonthChanged())); } - connect(pbAllDaysOfMonth, TQT_SIGNAL(clicked()), TQT_SLOT(slotAllDaysOfMonth())); + connect(pbAllDaysOfMonth, TQ_SIGNAL(clicked()), TQ_SLOT(slotAllDaysOfMonth())); for (int dm = 1; dm <= 31; dm++) { - connect(pbDayOfMonth[dm], TQT_SIGNAL(clicked()), TQT_SLOT(slotDayOfMonthChanged())); + connect(pbDayOfMonth[dm], TQ_SIGNAL(clicked()), TQ_SLOT(slotDayOfMonthChanged())); } - connect(pbAllDaysOfWeek, TQT_SIGNAL(clicked()), TQT_SLOT(slotAllDaysOfWeek())); + connect(pbAllDaysOfWeek, TQ_SIGNAL(clicked()), TQ_SLOT(slotAllDaysOfWeek())); for (int dw = 1; dw <= 7; dw++) { - connect(cbDayOfWeek[dw], TQT_SIGNAL(clicked()), TQT_SLOT(slotDayOfWeekChanged())); + connect(cbDayOfWeek[dw], TQ_SIGNAL(clicked()), TQ_SLOT(slotDayOfWeekChanged())); } - connect(pbAllHours, TQT_SIGNAL(clicked()), TQT_SLOT(slotAllHours())); + connect(pbAllHours, TQ_SIGNAL(clicked()), TQ_SLOT(slotAllHours())); for (int ho = 0; ho <= 23; ho++) { - connect(pbHour[ho], TQT_SIGNAL(clicked()), TQT_SLOT(slotHourChanged())); + connect(pbHour[ho], TQ_SIGNAL(clicked()), TQ_SLOT(slotHourChanged())); } - connect(pbAllMinutes, TQT_SIGNAL(clicked()), TQT_SLOT(slotAllMinutes())); + connect(pbAllMinutes, TQ_SIGNAL(clicked()), TQ_SLOT(slotAllMinutes())); for (int mi = 0; mi <= 55; mi+=5) { - connect(pbMinute[mi], TQT_SIGNAL(clicked()), TQT_SLOT(slotMinuteChanged())); + connect(pbMinute[mi], TQ_SIGNAL(clicked()), TQ_SLOT(slotMinuteChanged())); } // key acceleration key_accel = new TDEAccel(this); - key_accel->insert(TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT(slotOK())); - key_accel->insert(TDEStdAccel::Close, TQT_TQOBJECT(this), TQT_SLOT(slotCancel())); - key_accel->insert(TDEStdAccel::Quit, TQT_TQOBJECT(this), TQT_SLOT(slotCancel())); + key_accel->insert(TDEStdAccel::Open, this, TQ_SLOT(slotOK())); + key_accel->insert(TDEStdAccel::Close, this, TQ_SLOT(slotCancel())); + key_accel->insert(TDEStdAccel::Quit, this, TQ_SLOT(slotCancel())); key_accel->readSettings(); setFixedSize( minimumSize() ); diff --git a/kcron/kttask.h b/kcron/kttask.h index 40d1f6e..c77c008 100644 --- a/kcron/kttask.h +++ b/kcron/kttask.h @@ -30,7 +30,7 @@ class CTTask; */ class KTTask : public KDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcron/ktvariable.cpp b/kcron/ktvariable.cpp index 34b35ee..65628cb 100644 --- a/kcron/ktvariable.cpp +++ b/kcron/ktvariable.cpp @@ -87,10 +87,10 @@ KTVariable::KTVariable(CTVariable* _ctvar,const TQString &_caption) : cmbVariable->setFocus(); // connect them up - connect(cmbVariable,TQT_SIGNAL(highlighted(const TQString&)), - TQT_SLOT(slotVariableChanged())); - connect(cmbVariable,TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotVariableChanged())); + connect(cmbVariable,TQ_SIGNAL(highlighted(const TQString&)), + TQ_SLOT(slotVariableChanged())); + connect(cmbVariable,TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotVariableChanged())); } KTVariable::~KTVariable() diff --git a/kcron/ktvariable.h b/kcron/ktvariable.h index ea3ca2f..38adc08 100644 --- a/kcron/ktvariable.h +++ b/kcron/ktvariable.h @@ -32,7 +32,7 @@ class CTVariable; */ class KTVariable : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcron/ktview.cpp b/kcron/ktview.cpp index beab6a1..b9c3869 100644 --- a/kcron/ktview.cpp +++ b/kcron/ktview.cpp @@ -62,17 +62,17 @@ KTView::KTView(TQWidget *parent, const char* name) : refresh(); listView->setSelected(listView->firstChild(), true); - connect(this, TQT_SIGNAL(enableModificationButtons(bool)), parent, - TQT_SLOT(slotEnableModificationButtons(bool))); + connect(this, TQ_SIGNAL(enableModificationButtons(bool)), parent, + TQ_SLOT(slotEnableModificationButtons(bool))); - connect(this, TQT_SIGNAL(enablePaste(bool)), parent, - TQT_SLOT(slotEnablePaste(bool))); + connect(this, TQ_SIGNAL(enablePaste(bool)), parent, + TQ_SLOT(slotEnablePaste(bool))); - connect(this, TQT_SIGNAL(enableRunNow(bool)), parent, - TQT_SLOT(slotEnableRunNow(bool))); + connect(this, TQ_SIGNAL(enableRunNow(bool)), parent, + TQ_SLOT(slotEnableRunNow(bool))); - connect(this, TQT_SIGNAL(enableEnabled(bool)), parent, - TQT_SLOT(slotEnableEnabled(bool))); + connect(this, TQ_SIGNAL(enableEnabled(bool)), parent, + TQ_SLOT(slotEnableEnabled(bool))); } void KTView::disableIcons() @@ -158,17 +158,17 @@ void KTView::refresh() resizeEvent(); - connect(listView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(slotMenu(TQListViewItem*, const TQPoint&, int))); + connect(listView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(slotMenu(TQListViewItem*, const TQPoint&, int))); - connect(listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSetCurrent(TQListViewItem*))); + connect(listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSetCurrent(TQListViewItem*))); - connect(listView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(slotEdit(TQListViewItem*))); + connect(listView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(slotEdit(TQListViewItem*))); - connect(listView, TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(slotEdit(TQListViewItem*))); + connect(listView, TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(slotEdit(TQListViewItem*))); // switch to the new view if (tmpListView) diff --git a/kcron/ktview.h b/kcron/ktview.h index ced800a..da16550 100644 --- a/kcron/ktview.h +++ b/kcron/ktview.h @@ -33,7 +33,7 @@ class CTTask; */ class KTView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kdat/ArchiveInfoWidget.cpp b/kdat/ArchiveInfoWidget.cpp index c28d49f..48fd9de 100644 --- a/kdat/ArchiveInfoWidget.cpp +++ b/kdat/ArchiveInfoWidget.cpp @@ -88,8 +88,8 @@ ArchiveInfoWidget::ArchiveInfoWidget( TQWidget* parent, const char* name ) l1_4->addStretch( 1 ); l1_4->addWidget( _apply ); - connect( _archiveName, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotTextChanged( const TQString& ) ) ); - connect( _apply , TQT_SIGNAL( clicked() ) , this, TQT_SLOT( slotApply() ) ); + connect( _archiveName, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) ); + connect( _apply , TQ_SIGNAL( clicked() ) , this, TQ_SLOT( slotApply() ) ); } ArchiveInfoWidget::~ArchiveInfoWidget() diff --git a/kdat/ArchiveInfoWidget.h b/kdat/ArchiveInfoWidget.h index 0d2809f..b24bfff 100644 --- a/kdat/ArchiveInfoWidget.h +++ b/kdat/ArchiveInfoWidget.h @@ -31,7 +31,7 @@ class Archive; * @short Display/edit information about an archive index. */ class ArchiveInfoWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT Archive* _archive; TQLineEdit* _archiveName; diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp index 381bcf7..752c643 100644 --- a/kdat/BackupDlg.cpp +++ b/kdat/BackupDlg.cpp @@ -132,17 +132,17 @@ BackupDlg::BackupDlg( const TQString & archiveName, const TQString & workingDir, _ok = new KPushButton( KStdGuiItem::ok(), this ); _ok->setFixedSize( 80, _ok->sizeHint().height() ); - connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) ); + connect( _ok, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOK() ) ); _ok->setEnabled( FALSE ); _save = new TQPushButton( i18n( "Save Log..." ), this ); _save->setFixedSize( 80, _save->sizeHint().height() ); - connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) ); + connect( _save, TQ_SIGNAL( clicked() ), _log, TQ_SLOT( save() ) ); _save->setEnabled( FALSE ); _abort = new KPushButton( KStdGuiItem::cancel(), this ); _abort->setFixedSize( 80, _abort->sizeHint().height() ); - connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) ); + connect( _abort, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAbort() ) ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 ); @@ -214,7 +214,7 @@ void BackupDlg::show() } _tarParser = new TarParser(); - connect( _tarParser, TQT_SIGNAL( sigEntry( const TQString &, int, int, int ) ), this, TQT_SLOT( slotEntry( const TQString &, int, int, int ) ) ); + connect( _tarParser, TQ_SIGNAL( sigEntry( const TQString &, int, int, int ) ), this, TQ_SLOT( slotEntry( const TQString &, int, int, int ) ) ); _proc = new TDEProcess(); *_proc << Options::instance()->getTarCommand(); @@ -281,8 +281,8 @@ void BackupDlg::show() return; } - connect( _proc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); - connect( _proc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotStdout( TDEProcess*, char*, int ) ) ); + connect( _proc, TQ_SIGNAL( processExited( TDEProcess* ) ), this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) ); + connect( _proc, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQ_SLOT( slotStdout( TDEProcess*, char*, int ) ) ); startTimer( 1000 ); @@ -305,7 +305,7 @@ void BackupDlg::slotProcessExited( TDEProcess* ) TapeDrive::instance()->close(); TapeDrive::instance()->open(); - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); delete _proc; _tape->addChild( _archive ); @@ -381,7 +381,7 @@ void BackupDlg::slotOK() void BackupDlg::slotAbort() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); if ( _proc ) { _proc->kill(); delete _proc; diff --git a/kdat/BackupDlg.h b/kdat/BackupDlg.h index 57bd333..c0822eb 100644 --- a/kdat/BackupDlg.h +++ b/kdat/BackupDlg.h @@ -36,7 +36,7 @@ class TarParser; * @short Status dialog for backing up files. */ class BackupDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT TDEProcess* _proc; TarParser* _tarParser; diff --git a/kdat/BackupOptDlg.cpp b/kdat/BackupOptDlg.cpp index 23dc6d2..3a5e6c0 100644 --- a/kdat/BackupOptDlg.cpp +++ b/kdat/BackupOptDlg.cpp @@ -43,10 +43,10 @@ BackupOptDlg::BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent, cons KPushButton* ok = new KPushButton( KStdGuiItem::ok(), this ); ok->setFixedSize( 80, ok->sizeHint().height() ); - connect( ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( ok, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this ); cancel->setFixedSize( 80, ok->sizeHint().height() ); - connect( cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); + connect( cancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 ); l1->addWidget( _profile, 1 ); diff --git a/kdat/BackupOptDlg.h b/kdat/BackupOptDlg.h index 0ad4fd8..88f44f0 100644 --- a/kdat/BackupOptDlg.h +++ b/kdat/BackupOptDlg.h @@ -28,7 +28,7 @@ class BackupProfileWidget; * @short Display/edit the parameters for a backup operation. */ class BackupOptDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT BackupProfileWidget* _profile; public: diff --git a/kdat/BackupProfileInfoWidget.cpp b/kdat/BackupProfileInfoWidget.cpp index 3b347d3..07f7c35 100644 --- a/kdat/BackupProfileInfoWidget.cpp +++ b/kdat/BackupProfileInfoWidget.cpp @@ -77,11 +77,11 @@ BackupProfileInfoWidget::BackupProfileInfoWidget( TQWidget* parent, const char* l1_2->addStretch( 1 ); l1_2->addWidget( _apply ); - connect( setSelection, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( slotSetSelection() ) ); - connect( getSelection, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( slotGetSelection() ) ); - connect( _name , TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); - connect( _profile , TQT_SIGNAL( sigSomethingChanged() ) , this, TQT_SLOT( slotSomethingChanged() ) ); - connect( _apply , TQT_SIGNAL( clicked() ) , this, TQT_SLOT( slotApply() ) ); + connect( setSelection, TQ_SIGNAL( clicked() ) , this, TQ_SLOT( slotSetSelection() ) ); + connect( getSelection, TQ_SIGNAL( clicked() ) , this, TQ_SLOT( slotGetSelection() ) ); + connect( _name , TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); + connect( _profile , TQ_SIGNAL( sigSomethingChanged() ) , this, TQ_SLOT( slotSomethingChanged() ) ); + connect( _apply , TQ_SIGNAL( clicked() ) , this, TQ_SLOT( slotApply() ) ); } BackupProfileInfoWidget::~BackupProfileInfoWidget() diff --git a/kdat/BackupProfileInfoWidget.h b/kdat/BackupProfileInfoWidget.h index 246c4d2..8ff1bd0 100644 --- a/kdat/BackupProfileInfoWidget.h +++ b/kdat/BackupProfileInfoWidget.h @@ -27,7 +27,7 @@ class BackupProfileWidget; * @short Display/edit information about a backup profile. */ class BackupProfileInfoWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT BackupProfile* _backupProfile; TQLineEdit* _name; diff --git a/kdat/BackupProfileManager.h b/kdat/BackupProfileManager.h index 040e9fa..84adf43 100644 --- a/kdat/BackupProfileManager.h +++ b/kdat/BackupProfileManager.h @@ -38,7 +38,7 @@ * The BackupProfileManager follows the Singleton pattern. */ class BackupProfileManager : public TQObject { - Q_OBJECT + TQ_OBJECT static BackupProfileManager* _instance; diff --git a/kdat/BackupProfileWidget.cpp b/kdat/BackupProfileWidget.cpp index 2675adf..7a80b29 100644 --- a/kdat/BackupProfileWidget.cpp +++ b/kdat/BackupProfileWidget.cpp @@ -64,7 +64,7 @@ BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name ) _incremental = new TQCheckBox( i18n( "GNU listed incremental" ), two ); _incremental->setFixedHeight( _incremental->sizeHint().height() ); - connect( _incremental, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIncrementalToggled( bool ) ) ); + connect( _incremental, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIncrementalToggled( bool ) ) ); _snapshotLabel = new TQLabel( i18n( "Snapshot file:" ), two ); _snapshotLabel->setFixedSize( _snapshotLabel->sizeHint() ); @@ -109,12 +109,12 @@ BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name ) l2->addStretch( 1 ); - connect( _archiveName , TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); - connect( _workingDir , TQT_SIGNAL( activated( const TQString & ) ) , this, TQT_SLOT( slotWorkingDirActivated( const TQString & ) ) ); - connect( _oneFilesystem , TQT_SIGNAL( toggled( bool ) ) , this, TQT_SLOT( slotToggled( bool ) ) ); - connect( _incremental , TQT_SIGNAL( toggled( bool ) ) , this, TQT_SLOT( slotIncrementalToggled( bool ) ) ); - connect( _snapshotFile , TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); - connect( _removeSnapshot, TQT_SIGNAL( toggled( bool ) ) , this, TQT_SLOT( slotToggled( bool ) ) ); + connect( _archiveName , TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); + connect( _workingDir , TQ_SIGNAL( activated( const TQString & ) ) , this, TQ_SLOT( slotWorkingDirActivated( const TQString & ) ) ); + connect( _oneFilesystem , TQ_SIGNAL( toggled( bool ) ) , this, TQ_SLOT( slotToggled( bool ) ) ); + connect( _incremental , TQ_SIGNAL( toggled( bool ) ) , this, TQ_SLOT( slotIncrementalToggled( bool ) ) ); + connect( _snapshotFile , TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); + connect( _removeSnapshot, TQ_SIGNAL( toggled( bool ) ) , this, TQ_SLOT( slotToggled( bool ) ) ); } BackupProfileWidget::~BackupProfileWidget() diff --git a/kdat/BackupProfileWidget.h b/kdat/BackupProfileWidget.h index 5090774..4fd4060 100644 --- a/kdat/BackupProfileWidget.h +++ b/kdat/BackupProfileWidget.h @@ -34,7 +34,7 @@ class BackupProfile; * @short Display/edit the parameters for a backup operation. */ class BackupProfileWidget : public KTabCtl { - Q_OBJECT + TQ_OBJECT TQLineEdit* _archiveName; TQComboBox* _workingDir; diff --git a/kdat/FileInfoWidget.h b/kdat/FileInfoWidget.h index 36e26e4..618ba06 100644 --- a/kdat/FileInfoWidget.h +++ b/kdat/FileInfoWidget.h @@ -27,7 +27,7 @@ class TQLabel; * @short Display information about a local file. */ class FileInfoWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT TQLabel* _fileName; TQLabel* _ctime; diff --git a/kdat/FormatOptDlg.cpp b/kdat/FormatOptDlg.cpp index 14be994..ec67426 100644 --- a/kdat/FormatOptDlg.cpp +++ b/kdat/FormatOptDlg.cpp @@ -94,9 +94,9 @@ FormatOptDlg::FormatOptDlg( const TQString & def, TQWidget* parent, const char* _entry->setFocus(); _entry->selectAll(); - connect( _entry, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( okClicked() ) ); - connect( ok , TQT_SIGNAL( clicked() ) , this, TQT_SLOT( okClicked() ) ); - connect( cancel, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( reject() ) ); + connect( _entry, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( okClicked() ) ); + connect( ok , TQ_SIGNAL( clicked() ) , this, TQ_SLOT( okClicked() ) ); + connect( cancel, TQ_SIGNAL( clicked() ) , this, TQ_SLOT( reject() ) ); int size = Options::instance()->getDefaultTapeSize(); if ( ( size >= 1024*1024 ) && ( size % ( 1024*1024 ) == 0 ) ) { diff --git a/kdat/FormatOptDlg.h b/kdat/FormatOptDlg.h index b4d6c13..9186202 100644 --- a/kdat/FormatOptDlg.h +++ b/kdat/FormatOptDlg.h @@ -29,7 +29,7 @@ class TQLineEdit; * @short Display/edit options for formatting a tape. */ class FormatOptDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT TQString _name; int _size; diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp index 4c9ff2f..b7abf1d 100644 --- a/kdat/IndexDlg.cpp +++ b/kdat/IndexDlg.cpp @@ -109,17 +109,17 @@ IndexDlg::IndexDlg( Tape* tape, TQWidget* parent, const char* name ) _ok = new KPushButton( KStdGuiItem::ok(), this ); _ok->setFixedSize( 80, _ok->sizeHint().height() ); - connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) ); + connect( _ok, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOK() ) ); _ok->setEnabled( FALSE ); _save = new TQPushButton( i18n( "Save Log..." ), this ); _save->setFixedSize( 80, _save->sizeHint().height() ); - connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) ); + connect( _save, TQ_SIGNAL( clicked() ), _log, TQ_SLOT( save() ) ); _save->setEnabled( FALSE ); _abort = new TQPushButton( i18n( "Abort" ), this ); _abort->setFixedSize( 80, _abort->sizeHint().height() ); - connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) ); + connect( _abort, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAbort() ) ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 ); @@ -221,13 +221,13 @@ void IndexDlg::slotOK() void IndexDlg::slotAbort() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); _aborted = TRUE; } void IndexDlg::timerEvent( TQTimerEvent* ) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); // Rewind tape. _log->append( i18n( "Rewinding tape." ) ); @@ -263,7 +263,7 @@ void IndexDlg::timerEvent( TQTimerEvent* ) delete _tarParser; _tarParser = new TarParser(); - connect( _tarParser, TQT_SIGNAL( sigEntry( const TQString &, int, int, int ) ), this, TQT_SLOT( slotEntry( const TQString &, int, int, int ) ) ); + connect( _tarParser, TQ_SIGNAL( sigEntry( const TQString &, int, int, int ) ), this, TQ_SLOT( slotEntry( const TQString &, int, int, int ) ) ); int endBlock = 0; int leftover = 0; diff --git a/kdat/IndexDlg.h b/kdat/IndexDlg.h index 0d13741..14d6eb7 100644 --- a/kdat/IndexDlg.h +++ b/kdat/IndexDlg.h @@ -37,7 +37,7 @@ class TarParser; * @short Status dialog for recreating a tape index. */ class IndexDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT TarParser* _tarParser; Tape* _tape; diff --git a/kdat/InfoShellWidget.h b/kdat/InfoShellWidget.h index f461fb9..ad0ded6 100644 --- a/kdat/InfoShellWidget.h +++ b/kdat/InfoShellWidget.h @@ -25,7 +25,7 @@ * @short A suitable parent for the info widgets. */ class InfoShellWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp index 86a4fef..d47144f 100644 --- a/kdat/KDatMainWindow.cpp +++ b/kdat/KDatMainWindow.cpp @@ -98,55 +98,55 @@ KDatMainWindow::KDatMainWindow() // Create object popup menus. _tapeDriveMenu = new TQPopupMenu(); - _tapeDriveMenu->insertItem( i18n( "Mount Tape" ) , this, TQT_SLOT( fileMountTape() ) ); - _tapeDriveMenu->insertItem( i18n( "Recreate Tape Index" ), this, TQT_SLOT( fileIndexTape() ) ); + _tapeDriveMenu->insertItem( i18n( "Mount Tape" ) , this, TQ_SLOT( fileMountTape() ) ); + _tapeDriveMenu->insertItem( i18n( "Recreate Tape Index" ), this, TQ_SLOT( fileIndexTape() ) ); _tapeDriveMenu->insertSeparator(); - _tapeDriveMenu->insertItem( i18n( "Format Tape..." ), this, TQT_SLOT( fileFormatTape() ) ); + _tapeDriveMenu->insertItem( i18n( "Format Tape..." ), this, TQ_SLOT( fileFormatTape() ) ); _archiveMenu = new TQPopupMenu(); - _archiveMenu->insertItem( i18n( "Delete Archive" ), this, TQT_SLOT( fileDeleteArchive() ) ); + _archiveMenu->insertItem( i18n( "Delete Archive" ), this, TQ_SLOT( fileDeleteArchive() ) ); _mountedArchiveMenu = new TQPopupMenu(); - _mountedArchiveMenu->insertItem( i18n( "Verify..." ) , this, TQT_SLOT( fileVerify() ) ); - _mountedArchiveMenu->insertItem( i18n( "Restore..." ) , this, TQT_SLOT( fileRestore() ) ); + _mountedArchiveMenu->insertItem( i18n( "Verify..." ) , this, TQ_SLOT( fileVerify() ) ); + _mountedArchiveMenu->insertItem( i18n( "Restore..." ) , this, TQ_SLOT( fileRestore() ) ); _mountedArchiveMenu->insertSeparator(); - _mountedArchiveMenu->insertItem( i18n( "Delete Archive" ), this, TQT_SLOT( fileDeleteArchive() ) ); + _mountedArchiveMenu->insertItem( i18n( "Delete Archive" ), this, TQ_SLOT( fileDeleteArchive() ) ); _mountedTapeFileMenu = new TQPopupMenu(); - _mountedTapeFileMenu->insertItem( i18n( "Verify..." ) , this, TQT_SLOT( fileVerify() ) ); - _mountedTapeFileMenu->insertItem( i18n( "Restore..." ), this, TQT_SLOT( fileRestore() ) ); + _mountedTapeFileMenu->insertItem( i18n( "Verify..." ) , this, TQ_SLOT( fileVerify() ) ); + _mountedTapeFileMenu->insertItem( i18n( "Restore..." ), this, TQ_SLOT( fileRestore() ) ); _localFileMenu = new TQPopupMenu(); - _localFileMenu->insertItem( i18n( "Backup..." ), this, TQT_SLOT( fileBackup() ) ); + _localFileMenu->insertItem( i18n( "Backup..." ), this, TQ_SLOT( fileBackup() ) ); _tapeMenu = new TQPopupMenu(); - _tapeMenu->insertItem( i18n( "Delete Tape Index" ), this, TQT_SLOT( fileDeleteIndex() ) ); + _tapeMenu->insertItem( i18n( "Delete Tape Index" ), this, TQ_SLOT( fileDeleteIndex() ) ); _backupProfileRootMenu = new TQPopupMenu(); - _backupProfileRootMenu->insertItem( i18n( "Create Backup Profile" ), this, TQT_SLOT( fileNewBackupProfile() ) ); + _backupProfileRootMenu->insertItem( i18n( "Create Backup Profile" ), this, TQ_SLOT( fileNewBackupProfile() ) ); _backupProfileMenu = new TQPopupMenu(); - _backupProfileMenu->insertItem( i18n( "Backup..." ), this, TQT_SLOT( fileBackup() ) ); + _backupProfileMenu->insertItem( i18n( "Backup..." ), this, TQ_SLOT( fileBackup() ) ); _backupProfileMenu->insertSeparator(); - _backupProfileMenu->insertItem( i18n( "Delete Backup Profile" ), this, TQT_SLOT( fileDeleteBackupProfile() ) ); + _backupProfileMenu->insertItem( i18n( "Delete Backup Profile" ), this, TQ_SLOT( fileDeleteBackupProfile() ) ); _fileMenu = new TQPopupMenu; - _fileMenu->insertItem( i18n( "Backup..." ) , this, TQT_SLOT( fileBackup() ) ); - _fileMenu->insertItem( i18n( "Restore..." ) , this, TQT_SLOT( fileRestore() ) ); - _fileMenu->insertItem( i18n( "Verify..." ) , this, TQT_SLOT( fileVerify() ) ); - _fileMenu->insertItem( i18n( "Mount Tape" ) , this, TQT_SLOT( fileMountTape() ) ); - _fileMenu->insertItem( i18n( "Recreate Tape Index" ) , this, TQT_SLOT( fileIndexTape() ) ); - _fileMenu->insertItem( i18n( "Create Backup Profile" ), this, TQT_SLOT( fileNewBackupProfile() ) ); + _fileMenu->insertItem( i18n( "Backup..." ) , this, TQ_SLOT( fileBackup() ) ); + _fileMenu->insertItem( i18n( "Restore..." ) , this, TQ_SLOT( fileRestore() ) ); + _fileMenu->insertItem( i18n( "Verify..." ) , this, TQ_SLOT( fileVerify() ) ); + _fileMenu->insertItem( i18n( "Mount Tape" ) , this, TQ_SLOT( fileMountTape() ) ); + _fileMenu->insertItem( i18n( "Recreate Tape Index" ) , this, TQ_SLOT( fileIndexTape() ) ); + _fileMenu->insertItem( i18n( "Create Backup Profile" ), this, TQ_SLOT( fileNewBackupProfile() ) ); _fileMenu->insertSeparator(); - _fileMenu->insertItem( i18n( "Delete Archive" ) , this, TQT_SLOT( fileDeleteArchive() ) ); - _fileMenu->insertItem( i18n( "Delete Index" ) , this, TQT_SLOT( fileDeleteIndex() ) ); - _fileMenu->insertItem( i18n( "Delete Backup Profile" ), this, TQT_SLOT( fileDeleteBackupProfile() ) ); - _fileMenu->insertItem( i18n( "Format Tape..." ) , this, TQT_SLOT( fileFormatTape() ) ); + _fileMenu->insertItem( i18n( "Delete Archive" ) , this, TQ_SLOT( fileDeleteArchive() ) ); + _fileMenu->insertItem( i18n( "Delete Index" ) , this, TQ_SLOT( fileDeleteIndex() ) ); + _fileMenu->insertItem( i18n( "Delete Backup Profile" ), this, TQ_SLOT( fileDeleteBackupProfile() ) ); + _fileMenu->insertItem( i18n( "Format Tape..." ) , this, TQ_SLOT( fileFormatTape() ) ); _fileMenu->insertSeparator(); - _fileMenu->insertItem( SmallIcon("system-log-out"), i18n( "&Quit" ) , this, TQT_SLOT( fileQuit() ), CTRL + Key_Q ); + _fileMenu->insertItem( SmallIcon("system-log-out"), i18n( "&Quit" ) , this, TQ_SLOT( fileQuit() ), CTRL + Key_Q ); _editMenu = new TQPopupMenu; - _editMenu->insertItem( SmallIcon("configure"), i18n( "Configure KDat..." ) , this, TQT_SLOT( editPreferences() ) ); + _editMenu->insertItem( SmallIcon("configure"), i18n( "Configure KDat..." ) , this, TQ_SLOT( editPreferences() ) ); _menu = new KMenuBar( this ); _menu->insertItem( i18n( "&File" ), _fileMenu ); @@ -157,15 +157,15 @@ KDatMainWindow::KDatMainWindow() _toolbar = new TDEToolBar( this ); - _toolbar->insertButton( *ImageCache::instance()->getTapeUnmounted(), 0, TQT_SIGNAL( clicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( fileMountTape() ), TRUE, i18n( "Mount/unmount tape" ) ); + _toolbar->insertButton( *ImageCache::instance()->getTapeUnmounted(), 0, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( fileMountTape() ), TRUE, i18n( "Mount/unmount tape" ) ); _toolbar->insertSeparator(); - _toolbar->insertButton( *ImageCache::instance()->getBackup() , 1, TQT_SIGNAL( clicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( fileBackup() ) , TRUE, i18n( "Backup" ) ); + _toolbar->insertButton( *ImageCache::instance()->getBackup() , 1, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( fileBackup() ) , TRUE, i18n( "Backup" ) ); _toolbar->setButtonIconSet( 1, BarIconSet("kdat_backup")); - _toolbar->insertButton( *ImageCache::instance()->getRestore(), 2, TQT_SIGNAL( clicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( fileRestore() ), TRUE, i18n( "Restore" ) ); + _toolbar->insertButton( *ImageCache::instance()->getRestore(), 2, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( fileRestore() ), TRUE, i18n( "Restore" ) ); _toolbar->setButtonIconSet( 2, BarIconSet("kdat_restore")); - _toolbar->insertButton( *ImageCache::instance()->getVerify() , 3, TQT_SIGNAL( clicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( fileVerify() ) , TRUE, i18n( "Verify" ) ); + _toolbar->insertButton( *ImageCache::instance()->getVerify() , 3, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( fileVerify() ) , TRUE, i18n( "Verify" ) ); _toolbar->setButtonIconSet( 3, BarIconSet("kdat_verify")); addToolBar( _toolbar ); @@ -173,9 +173,9 @@ KDatMainWindow::KDatMainWindow() _statusBar->insertItem( i18n( "Ready." ), 0 ); #ifdef KDAT_HORIZONTAL_LAYOUT /* 2002-01-20 LEW */ - _panner = new TQSplitter( Qt::Horizontal, this, "panner"); + _panner = new TQSplitter( TQt::Horizontal, this, "panner"); #else - _panner = new TQSplitter( Qt::Vertical, this, "panner"); + _panner = new TQSplitter( TQt::Vertical, this, "panner"); #endif /* KDAT_HORIZONTAL_LAYOUT */ // Create info viewers. @@ -197,12 +197,12 @@ KDatMainWindow::KDatMainWindow() _tree->setMinimumHeight( 300 ); #endif /* KDAT_HORIZONTAL_LAYOUT */ - connect( _tree, TQT_SIGNAL( expanding( KTreeViewItem*, bool& ) ), this, TQT_SLOT( localExpanding( KTreeViewItem*, bool& ) ) ); - connect( _tree, TQT_SIGNAL( expanded( int ) ), this, TQT_SLOT( localExpanded( int ) ) ); - connect( _tree, TQT_SIGNAL( collapsed( int ) ), this, TQT_SLOT( localCollapsed( int ) ) ); - connect( _tree, TQT_SIGNAL( selected( int ) ), this, TQT_SLOT( localSelected( int ) ) ); - connect( _tree, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( localHighlighted( int ) ) ); - connect( _tree, TQT_SIGNAL( popupMenu( int, const TQPoint& ) ), this, TQT_SLOT( localPopupMenu( int, const TQPoint& ) ) ); + connect( _tree, TQ_SIGNAL( expanding( KTreeViewItem*, bool& ) ), this, TQ_SLOT( localExpanding( KTreeViewItem*, bool& ) ) ); + connect( _tree, TQ_SIGNAL( expanded( int ) ), this, TQ_SLOT( localExpanded( int ) ) ); + connect( _tree, TQ_SIGNAL( collapsed( int ) ), this, TQ_SLOT( localCollapsed( int ) ) ); + connect( _tree, TQ_SIGNAL( selected( int ) ), this, TQ_SLOT( localSelected( int ) ) ); + connect( _tree, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( localHighlighted( int ) ) ); + connect( _tree, TQ_SIGNAL( popupMenu( int, const TQPoint& ) ), this, TQ_SLOT( localPopupMenu( int, const TQPoint& ) ) ); setCentralWidget( _panner ); @@ -211,14 +211,14 @@ KDatMainWindow::KDatMainWindow() _tree->insertItem( _backupProfileRootNode = new BackupProfileRootNode() ); _tree->insertItem( new TapeIndexRootNode() ); - connect( TapeDrive::instance(), TQT_SIGNAL( sigStatus( const TQString & ) ), this, TQT_SLOT( status( const TQString & ) ) ); + connect( TapeDrive::instance(), TQ_SIGNAL( sigStatus( const TQString & ) ), this, TQ_SLOT( status( const TQString & ) ) ); setTapePresent( FALSE ); - connect( Options::instance(), TQT_SIGNAL( sigTapeDevice() ), this, TQT_SLOT( slotTapeDevice() ) ); + connect( Options::instance(), TQ_SIGNAL( sigTapeDevice() ), this, TQ_SLOT( slotTapeDevice() ) ); - connect( TapeManager::instance(), TQT_SIGNAL( sigTapeMounted() ) , this, TQT_SLOT( slotTapeMounted() ) ); - connect( TapeManager::instance(), TQT_SIGNAL( sigTapeUnmounted() ), this, TQT_SLOT( slotTapeUnmounted() ) ); + connect( TapeManager::instance(), TQ_SIGNAL( sigTapeMounted() ) , this, TQ_SLOT( slotTapeMounted() ) ); + connect( TapeManager::instance(), TQ_SIGNAL( sigTapeUnmounted() ), this, TQ_SLOT( slotTapeUnmounted() ) ); configureUI( 0 ); } @@ -1354,7 +1354,7 @@ void KDatMainWindow::create_backup_dialog() to accomodate a wider message :( */ // _cancel->setGeometry( TQRect( 50, 170, 0, 0 ) ); /* 2002-01-28 LEW */ _cancel->setGeometry( TQRect( 50, 230, 0, 0 ) ); - connect( _cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( backupCancel() ) ); + connect( _cancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( backupCancel() ) ); _continue = new KPushButton( KStdGuiItem::cont(), _backupdialog ); _continue->setFixedSize( 80, _continue->sizeHint().height() ); @@ -1362,7 +1362,7 @@ void KDatMainWindow::create_backup_dialog() _continue->setDefault( TRUE ); // _continue->setGeometry( TQRect( 200, 170, 0, 0 ) ); /* 2002-01-28 LEW */ _continue->setGeometry( TQRect( 200, 230, 0, 0 ) ); - connect( _continue, TQT_SIGNAL( clicked() ), this, TQT_SLOT( backupContinue() ) ); + connect( _continue, TQ_SIGNAL( clicked() ), this, TQ_SLOT( backupContinue() ) ); _backupdialog->show(); } diff --git a/kdat/KDatMainWindow.h b/kdat/KDatMainWindow.h index f709f5f..34772dc 100644 --- a/kdat/KDatMainWindow.h +++ b/kdat/KDatMainWindow.h @@ -52,7 +52,7 @@ class TapeInfoWidget; * @short The KDat main window. Everything happens from here. */ class KDatMainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT private: diff --git a/kdat/LoggerWidget.h b/kdat/LoggerWidget.h index 00e80c9..221962b 100644 --- a/kdat/LoggerWidget.h +++ b/kdat/LoggerWidget.h @@ -27,7 +27,7 @@ class TQMultiLineEdit; * @short A titled logging widget with a save option. */ class LoggerWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT TQMultiLineEdit* _mle; public: diff --git a/kdat/Node.cpp b/kdat/Node.cpp index e8322e2..5134caa 100644 --- a/kdat/Node.cpp +++ b/kdat/Node.cpp @@ -1186,9 +1186,9 @@ TapeDriveNode::TapeDriveNode() { setDelayedExpanding( TRUE ); - connect( TapeManager::instance(), TQT_SIGNAL( sigTapeMounted() ) , this, TQT_SLOT( slotTapeMounted() ) ); - connect( TapeManager::instance(), TQT_SIGNAL( sigTapeUnmounted() ) , this, TQT_SLOT( slotTapeUnmounted() ) ); - connect( TapeManager::instance(), TQT_SIGNAL( sigTapeModified( Tape* ) ), this, TQT_SLOT( slotTapeModified( Tape* ) ) ); + connect( TapeManager::instance(), TQ_SIGNAL( sigTapeMounted() ) , this, TQ_SLOT( slotTapeMounted() ) ); + connect( TapeManager::instance(), TQ_SIGNAL( sigTapeUnmounted() ) , this, TQ_SLOT( slotTapeUnmounted() ) ); + connect( TapeManager::instance(), TQ_SIGNAL( sigTapeModified( Tape* ) ), this, TQ_SLOT( slotTapeModified( Tape* ) ) ); } bool TapeDriveNode::isType( int type ) @@ -1336,9 +1336,9 @@ TapeIndexRootNode::TapeIndexRootNode() { setDelayedExpanding( TRUE ); - connect( TapeManager::instance(), TQT_SIGNAL( sigTapeAdded( Tape* ) ) , this, TQT_SLOT( slotTapeAdded( Tape* ) ) ); - connect( TapeManager::instance(), TQT_SIGNAL( sigTapeRemoved( Tape* ) ) , this, TQT_SLOT( slotTapeRemoved( Tape* ) ) ); - connect( TapeManager::instance(), TQT_SIGNAL( sigTapeModified( Tape* ) ), this, TQT_SLOT( slotTapeModified( Tape* ) ) ); + connect( TapeManager::instance(), TQ_SIGNAL( sigTapeAdded( Tape* ) ) , this, TQ_SLOT( slotTapeAdded( Tape* ) ) ); + connect( TapeManager::instance(), TQ_SIGNAL( sigTapeRemoved( Tape* ) ) , this, TQ_SLOT( slotTapeRemoved( Tape* ) ) ); + connect( TapeManager::instance(), TQ_SIGNAL( sigTapeModified( Tape* ) ), this, TQ_SLOT( slotTapeModified( Tape* ) ) ); } bool TapeIndexRootNode::isType( int type ) @@ -1471,12 +1471,12 @@ BackupProfileRootNode::BackupProfileRootNode() { setDelayedExpanding( TRUE ); - connect( BackupProfileManager::instance(), TQT_SIGNAL( sigBackupProfileAdded( BackupProfile* ) ) , - this, TQT_SLOT( slotBackupProfileAdded( BackupProfile* ) ) ); - connect( BackupProfileManager::instance(), TQT_SIGNAL( sigBackupProfileRemoved( BackupProfile* ) ) , - this, TQT_SLOT( slotBackupProfileRemoved( BackupProfile* ) ) ); - connect( BackupProfileManager::instance(), TQT_SIGNAL( sigBackupProfileModified( BackupProfile* ) ), - this, TQT_SLOT( slotBackupProfileModified( BackupProfile* ) ) ); + connect( BackupProfileManager::instance(), TQ_SIGNAL( sigBackupProfileAdded( BackupProfile* ) ) , + this, TQ_SLOT( slotBackupProfileAdded( BackupProfile* ) ) ); + connect( BackupProfileManager::instance(), TQ_SIGNAL( sigBackupProfileRemoved( BackupProfile* ) ) , + this, TQ_SLOT( slotBackupProfileRemoved( BackupProfile* ) ) ); + connect( BackupProfileManager::instance(), TQ_SIGNAL( sigBackupProfileModified( BackupProfile* ) ), + this, TQ_SLOT( slotBackupProfileModified( BackupProfile* ) ) ); } void BackupProfileRootNode::setSelected( BackupProfile* pBackupProfile ) diff --git a/kdat/Node.h b/kdat/Node.h index 81e1757..5a55aed 100644 --- a/kdat/Node.h +++ b/kdat/Node.h @@ -816,7 +816,7 @@ public: * @short This node represents a tape drive. */ class TapeDriveNode : public TQObject, public Node { - Q_OBJECT + TQ_OBJECT MountedArchiveNode* findArchiveNode( Archive* archive ); @@ -874,7 +874,7 @@ public slots: * @short This node represents the root of the tape index subtree. */ class TapeIndexRootNode : public TQObject, public Node { - Q_OBJECT + TQ_OBJECT TapeNode* findTapeNode( Tape* tape ); @@ -981,7 +981,7 @@ public: * @short This node represents the root of the backup profile subtree. */ class BackupProfileRootNode : public TQObject, public Node { - Q_OBJECT + TQ_OBJECT BackupProfileNode* findBackupProfileNode( BackupProfile* backupProfile ); diff --git a/kdat/Options.h b/kdat/Options.h index 7543897..237ab75 100644 --- a/kdat/Options.h +++ b/kdat/Options.h @@ -27,7 +27,7 @@ class TDEConfig; * @short The central repository for user preferences. */ class Options : public TQObject { - Q_OBJECT + TQ_OBJECT TDEConfig* _config; int _defaultTapeSize; diff --git a/kdat/OptionsDlg.cpp b/kdat/OptionsDlg.cpp index 3f29fae..22d7304 100644 --- a/kdat/OptionsDlg.cpp +++ b/kdat/OptionsDlg.cpp @@ -41,11 +41,11 @@ OptionsDlg::OptionsDlg( TQWidget* parent, const char* name ) _baseWidget = new OptionsDlgWidget ( 0 ); setMainWidget (_baseWidget); - connect( _baseWidget, TQT_SIGNAL( valueChanged () ), this, TQT_SLOT( slotChanged() ) ); + connect( _baseWidget, TQ_SIGNAL( valueChanged () ), this, TQ_SLOT( slotChanged() ) ); - connect( this, TQT_SIGNAL( okClicked () ), this, TQT_SLOT( slotOK() ) ); - connect( this, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( this, TQ_SIGNAL( okClicked () ), this, TQ_SLOT( slotOK() ) ); + connect( this, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApply() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) ); int size = Options::instance()->getDefaultTapeSize(); if ( ( size >= 1024*1024 ) && ( size % ( 1024*1024 ) == 0 ) ) { diff --git a/kdat/OptionsDlg.h b/kdat/OptionsDlg.h index db62244..9359639 100644 --- a/kdat/OptionsDlg.h +++ b/kdat/OptionsDlg.h @@ -28,7 +28,7 @@ class OptionsDlgWidget; * @short Display/edit user preferences. */ class OptionsDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT private slots: void slotOK(); diff --git a/kdat/OptionsDlgWidget.ui b/kdat/OptionsDlgWidget.ui index d5e7767..c7464a0 100644 --- a/kdat/OptionsDlgWidget.ui +++ b/kdat/OptionsDlgWidget.ui @@ -374,16 +374,16 @@ You must still specify the block size.</string> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">OptionsDlgWidget.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>doBrowseTapeDevice()</signal> <signal>doBrowseTarCommand()</signal> <signal>valueChanged()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="protected">slotValueChanged()</slot> <slot access="protected">slotBrowseTapeDevice()</slot> <slot access="protected">slotBrowseTarCommand()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="11" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> @@ -210,7 +210,7 @@ c/o rolandg at onlinehome.de: 2001-08-01 These are possible sources of bugs: -1) don't return 0 instead of a null QString +1) don't return 0 instead of a null TQString (e.g., BackupProfile::getWorkingDirectory()) 2) don't test for FALSE predicate values with !(). Use == FALSE instead. @@ -218,7 +218,7 @@ c/o rolandg at onlinehome.de: _relativeFiles.remove(_relativeFiles.first()) Instead, separate the two: - QString my_first = _relativeFiles.first(); + TQString my_first = _relativeFiles.first(); _relativeFiles.remove( my_first ); This may be important with any call to .remove() diff --git a/kdat/TapeDrive.h b/kdat/TapeDrive.h index dea4dbf..8e6bc1c 100644 --- a/kdat/TapeDrive.h +++ b/kdat/TapeDrive.h @@ -27,7 +27,7 @@ class Tape; * @short An OO interface to the tape drive. */ class TapeDrive : public TQObject { - Q_OBJECT + TQ_OBJECT int _fd; bool _readOnly; diff --git a/kdat/TapeFileInfoWidget.h b/kdat/TapeFileInfoWidget.h index c0f4476..c5b3bf9 100644 --- a/kdat/TapeFileInfoWidget.h +++ b/kdat/TapeFileInfoWidget.h @@ -29,7 +29,7 @@ class File; * @short Display information about a tape file. */ class TapeFileInfoWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT File* _file; TQLabel* _fileName; diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp index b0e8199..c6498b7 100644 --- a/kdat/TapeInfoWidget.cpp +++ b/kdat/TapeInfoWidget.cpp @@ -141,10 +141,10 @@ TapeInfoWidget::TapeInfoWidget( TQWidget* parent, const char* name ) l1_8->addStretch( 1 ); l1_8->addWidget( _apply ); - connect( _tapeName , TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); - connect( _tapeSize , TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); - connect( _tapeSizeUnits, TQT_SIGNAL( activated( int ) ) , this, TQT_SLOT( slotActivated( int ) ) ); - connect( _apply , TQT_SIGNAL( clicked() ) , this, TQT_SLOT( slotApply() ) ); + connect( _tapeName , TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); + connect( _tapeSize , TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); + connect( _tapeSizeUnits, TQ_SIGNAL( activated( int ) ) , this, TQ_SLOT( slotActivated( int ) ) ); + connect( _apply , TQ_SIGNAL( clicked() ) , this, TQ_SLOT( slotApply() ) ); } TapeInfoWidget::~TapeInfoWidget() diff --git a/kdat/TapeInfoWidget.h b/kdat/TapeInfoWidget.h index 106adcd..4d9cf0a 100644 --- a/kdat/TapeInfoWidget.h +++ b/kdat/TapeInfoWidget.h @@ -32,7 +32,7 @@ class Tape; * @short Display/edit information about a tape index. */ class TapeInfoWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT Tape* _tape; TQLineEdit* _tapeName; diff --git a/kdat/TapeManager.h b/kdat/TapeManager.h index 2a7bd02..06cbb6c 100644 --- a/kdat/TapeManager.h +++ b/kdat/TapeManager.h @@ -42,7 +42,7 @@ * The TapeManager follows the Singleton pattern. */ class TapeManager : public TQObject { - Q_OBJECT + TQ_OBJECT static TapeManager* _instance; diff --git a/kdat/TarParser.h b/kdat/TarParser.h index c9301aa..ee01226 100644 --- a/kdat/TarParser.h +++ b/kdat/TarParser.h @@ -167,7 +167,7 @@ union record * @short A parser for GNU tar archives. */ class TarParser : public TQObject { - Q_OBJECT + TQ_OBJECT char _buf[512]; int _bufIdx; diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp index c43fa00..72a2505 100644 --- a/kdat/VerifyDlg.cpp +++ b/kdat/VerifyDlg.cpp @@ -138,17 +138,17 @@ VerifyDlg::VerifyDlg( const TQString & workingDir, int fileno, const RangeList& _ok = new KPushButton( KStdGuiItem::ok(), this ); _ok->setFixedSize( 80, _ok->sizeHint().height() ); - connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) ); + connect( _ok, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOK() ) ); _ok->setEnabled( FALSE ); _save = new TQPushButton( i18n( "&Save Log..." ), this ); _save->setFixedSize( 80, _save->sizeHint().height() ); - connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) ); + connect( _save, TQ_SIGNAL( clicked() ), _log, TQ_SLOT( save() ) ); _save->setEnabled( FALSE ); _abort = new TQPushButton( i18n( "&Abort" ), this ); _abort->setFixedSize( 80, _abort->sizeHint().height() ); - connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) ); + connect( _abort, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAbort() ) ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 ); @@ -219,9 +219,9 @@ void VerifyDlg::show() *_proc << "-dvf" << "-"; } - connect( _proc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); - connect( _proc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotStdout( TDEProcess*, char*, int ) ) ); - connect( _proc, TQT_SIGNAL( wroteStdin( TDEProcess* ) ), this, TQT_SLOT( slotWroteStdin( TDEProcess* ) ) ); + connect( _proc, TQ_SIGNAL( processExited( TDEProcess* ) ), this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) ); + connect( _proc, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQ_SLOT( slotStdout( TDEProcess*, char*, int ) ) ); + connect( _proc, TQ_SIGNAL( wroteStdin( TDEProcess* ) ), this, TQ_SLOT( slotWroteStdin( TDEProcess* ) ) ); _startTime = time( NULL ); startTimer( 100 ); @@ -233,7 +233,7 @@ void VerifyDlg::show() void VerifyDlg::slotProcessExited( TDEProcess* ) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); delete _proc; // Set this, or we get caught in a loop. @@ -307,7 +307,7 @@ void VerifyDlg::slotAbort() void VerifyDlg::timerEvent( TQTimerEvent* ) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); int oldElapsed = 0; diff --git a/kdat/VerifyDlg.h b/kdat/VerifyDlg.h index fbde1da..bb330f3 100644 --- a/kdat/VerifyDlg.h +++ b/kdat/VerifyDlg.h @@ -36,7 +36,7 @@ class TapeDrive; * @short Status dialog for verifying/restoring parts of an archive. */ class VerifyDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT bool _restore; TDEProcess* _proc; diff --git a/kdat/VerifyOptDlg.cpp b/kdat/VerifyOptDlg.cpp index 499027b..8768000 100644 --- a/kdat/VerifyOptDlg.cpp +++ b/kdat/VerifyOptDlg.cpp @@ -98,10 +98,10 @@ VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, boo _entry->setFocus(); _entry->selectAll(); - connect( _entry, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( okClicked() ) ); - connect( browse, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( slotBrowse() ) ); - connect( ok , TQT_SIGNAL( clicked() ) , this, TQT_SLOT( okClicked() ) ); - connect( cancel, TQT_SIGNAL( clicked() ) , this, TQT_SLOT( reject() ) ); + connect( _entry, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( okClicked() ) ); + connect( browse, TQ_SIGNAL( clicked() ) , this, TQ_SLOT( slotBrowse() ) ); + connect( ok , TQ_SIGNAL( clicked() ) , this, TQ_SLOT( okClicked() ) ); + connect( cancel, TQ_SIGNAL( clicked() ) , this, TQ_SLOT( reject() ) ); } VerifyOptDlg::~VerifyOptDlg() diff --git a/kdat/VerifyOptDlg.h b/kdat/VerifyOptDlg.h index a08d80e..c1444f8 100644 --- a/kdat/VerifyOptDlg.h +++ b/kdat/VerifyOptDlg.h @@ -31,7 +31,7 @@ class TQLineEdit; * have been combined into a single dialog. */ class VerifyOptDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT bool _restore; TQString _workingDir; diff --git a/kdat/ktreeview.cpp b/kdat/ktreeview.cpp index 24712d4..f3a98ce 100644 --- a/kdat/ktreeview.cpp +++ b/kdat/ktreeview.cpp @@ -350,7 +350,7 @@ void KTreeViewItem::paintHighlight(TQPainter* p, int indent, const TQColorGroup& textRect.setCoords(l - 1, t - 1, r + 1, b + 1); p->setPen(TQPen(TQt::yellow, 0, TQt::DotLine)); p->setBackgroundColor(fc); - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); p->drawRect(textRect); textRect.setCoords(l - 2, t - 2, r + 2, b + 2); p->setPen(fc); @@ -1701,7 +1701,7 @@ void KTreeView::mousePressEvent(TQMouseEvent *e) { // first: check which button was pressed - if (e->button() == Qt::MidButton) + if (e->button() == TQt::MidButton) { // RB: the MMB is hardcoded to the "rubberband" scroll mode if (!rubberband_mode) { @@ -1709,7 +1709,7 @@ void KTreeView::mousePressEvent(TQMouseEvent *e) } return; } - else if ( ( rubberband_mode ) && ( e->button() != Qt::RightButton ) ) + else if ( ( rubberband_mode ) && ( e->button() != TQt::RightButton ) ) { // another button was pressed while rubberbanding, stop the move. // RB: if we allow other buttons while rubberbanding the tree can expand @@ -1751,7 +1751,7 @@ void KTreeView::mousePressEvent(TQMouseEvent *e) // hit item (to show info on the file/dir label clicked) else if (item->boundingRect(indentation(item)).contains(cellCoord)) { setCurrentItem(itemClicked); // highlight item - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { emit popupMenu( itemClicked, mapToGlobal( TQPoint( e->pos().x(), e->pos().y() ) ) ); } } @@ -1761,7 +1761,7 @@ void KTreeView::mousePressEvent(TQMouseEvent *e) void KTreeView::mouseReleaseEvent(TQMouseEvent *e) { /* if it's the MMB end rubberbanding */ - if (rubberband_mode && e->button()==Qt::MidButton) + if (rubberband_mode && e->button()==TQt::MidButton) { end_rubberband(); } diff --git a/kdat/ktreeview.h b/kdat/ktreeview.h index 4cb7958..a6031c4 100644 --- a/kdat/ktreeview.h +++ b/kdat/ktreeview.h @@ -398,7 +398,7 @@ typedef bool (*KForEvery) class KTreeView : public TQGridView { friend class KTreeViewItem; - Q_OBJECT + TQ_OBJECT public: /** diff --git a/knetworkconf/knetworkconf/CMakeLists.txt b/knetworkconf/knetworkconf/CMakeLists.txt index dc23479..7750c9a 100644 --- a/knetworkconf/knetworkconf/CMakeLists.txt +++ b/knetworkconf/knetworkconf/CMakeLists.txt @@ -13,9 +13,6 @@ link_directories( ${TDE_LIB_DIR} ) -add_definitions( -UTQT_NO_COMPAT -) - ##### kcm_knetworkconfmodule (kpart) ############ diff --git a/knetworkconf/knetworkconf/Makefile.am b/knetworkconf/knetworkconf/Makefile.am index 3b4e4c9..29ffe82 100644 --- a/knetworkconf/knetworkconf/Makefile.am +++ b/knetworkconf/knetworkconf/Makefile.am @@ -2,9 +2,6 @@ #INCLUDES= $(all_includes) AM_CPPFLAGS = $(all_includes) -# We use deprecated routines in QButton, undefine TQT_NO_COMPAT. -KDE_CXXFLAGS = -UTQT_NO_COMPAT - METASOURCES = AUTO #bin_PROGRAMS = knetworkconf diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp index d68dffe..aaeb48e 100644 --- a/knetworkconf/knetworkconf/kadddevicecontainer.cpp +++ b/knetworkconf/knetworkconf/kadddevicecontainer.cpp @@ -25,7 +25,7 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name) //Setup extension dialog setExtension( new KAddDeviceDlgExtension( this ) ); - setOrientation(Qt::Vertical ); + setOrientation(TQt::Vertical ); //Create dialog that contains the KAddDeviceDlg and KAddDeviceWifiExt (when //configuring a wireless interface) widgets @@ -64,30 +64,30 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name) mainLayout->setResizeMode(TQLayout::Auto); //Setup connections - connect((KAddDeviceDlgExtension*)extension(),TQT_SIGNAL(valueChangedSignal(int)),this,TQT_SLOT(toggleApplyButtonSlot(int))); - connect(addDlg->kleIPAddress,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); -// connect(addDlg->kleGateway,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); - connect(addDlg->kcbNetmask,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toggleApplyButtonSlot(int))); - connect(addDlg->kcbAutoBootProto,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); - connect(addDlg->kcbstartAtBoot,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(toggleApplyButtonSlot(int))); - connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggleAdvancedOptionsSlot(bool))); - connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),kpbAdvanced,TQT_SLOT(setDisabled(bool))); - connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(toggleApplyButtonSlot(int))); - // connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kleIPAddress,TQT_SLOT(setDisabled(bool))); - // connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kcbNetmask,TQT_SLOT(setDisabled(bool))); - // connect(addDlg->rbBootProtoManual,TQT_SIGNAL(toggled(bool)),addDlg->kcbAutoBootProto,TQT_SLOT(setDisabled(bool))); - connect(kpbCancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelSlot())); - connect(kpbApply,TQT_SIGNAL(clicked()),this,TQT_SLOT(verifyDeviceInfoSlot())); - connect(kpbAdvanced,TQT_SIGNAL(clicked()),this,TQT_SLOT(advancedOptionsSlot())); + connect((KAddDeviceDlgExtension*)extension(),TQ_SIGNAL(valueChangedSignal(int)),this,TQ_SLOT(toggleApplyButtonSlot(int))); + connect(addDlg->kleIPAddress,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); +// connect(addDlg->kleGateway,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(addDlg->kcbNetmask,TQ_SIGNAL(activated(int)),this,TQ_SLOT(toggleApplyButtonSlot(int))); + connect(addDlg->kcbAutoBootProto,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(addDlg->kcbstartAtBoot,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(toggleApplyButtonSlot(int))); + connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(toggleAdvancedOptionsSlot(bool))); + connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(toggled(bool)),kpbAdvanced,TQ_SLOT(setDisabled(bool))); + connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(toggleApplyButtonSlot(int))); + // connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(toggled(bool)),addDlg->kleIPAddress,TQ_SLOT(setDisabled(bool))); + // connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(toggled(bool)),addDlg->kcbNetmask,TQ_SLOT(setDisabled(bool))); + // connect(addDlg->rbBootProtoManual,TQ_SIGNAL(toggled(bool)),addDlg->kcbAutoBootProto,TQ_SLOT(setDisabled(bool))); + connect(kpbCancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelSlot())); + connect(kpbApply,TQ_SIGNAL(clicked()),this,TQ_SLOT(verifyDeviceInfoSlot())); + connect(kpbAdvanced,TQ_SIGNAL(clicked()),this,TQ_SLOT(advancedOptionsSlot())); } void KAddDeviceContainer::addWirelessWidget(){ extDlg = new KAddDeviceWifiExt(this); mainLayout->addWidget( extDlg ); - connect(extDlg->kleEssid,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); - connect(extDlg->kleWepKey,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); - connect(extDlg->qcbKeyType,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(extDlg->kleEssid,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(extDlg->kleWepKey,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(extDlg->qcbKeyType,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); } void KAddDeviceContainer::toggleApplyButtonSlot( const TQString & ) { @@ -150,13 +150,6 @@ void KAddDeviceContainer::verifyDeviceInfoSlot() } } -void KAddDeviceContainer::makeButtonsResizeable() -{ - kpbApply->setAutoResize(true); - kpbAdvanced->setAutoResize(true); - kpbCancel->setAutoResize(true); -} - bool KAddDeviceContainer::modified() { return _modified; diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.h b/knetworkconf/knetworkconf/kadddevicecontainer.h index 80e954e..8eca304 100644 --- a/knetworkconf/knetworkconf/kadddevicecontainer.h +++ b/knetworkconf/knetworkconf/kadddevicecontainer.h @@ -45,7 +45,7 @@ Network interface configuration dialog. This dialog contains the KAddDeviceDlg a */ class KAddDeviceContainer : public KDialog { - Q_OBJECT + TQ_OBJECT public: KAddDeviceContainer(TQWidget *parent = 0, const char *name = 0); @@ -61,9 +61,6 @@ class KAddDeviceContainer : public KDialog bool modified(); bool advanced(); - private: - void makeButtonsResizeable(); - protected: TQVBoxLayout* mainLayout; TQHBoxLayout* buttonsLayout; diff --git a/knetworkconf/knetworkconf/kadddevicedlgextension.ui b/knetworkconf/knetworkconf/kadddevicedlgextension.ui index cbb59f0..27f15aa 100644 --- a/knetworkconf/knetworkconf/kadddevicedlgextension.ui +++ b/knetworkconf/knetworkconf/kadddevicedlgextension.ui @@ -138,12 +138,12 @@ <includes> <include location="local" impldecl="in implementation">kadddevicedlgextension.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>valueChangedSignal(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="private">valueChanged( const TQString & s )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> </functions> diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui b/knetworkconf/knetworkconf/kadddnsserverdlg.ui index a05a9e7..5bcf80a 100644 --- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui +++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui @@ -147,10 +147,9 @@ <includes> <include location="local" impldecl="in implementation">kadddnsserverdlg.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">validateAddressSlot()</slot> - <slot access="private">makeButtonsResizeable()</slot> -</Q_SLOTS> +</slots> <functions> <function specifier="non virtual">setAddingAlias( bool add )</function> <function returnType="bool">modified()</function> diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h index 3eba8a6..b2b9a49 100644 --- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h +++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h @@ -25,7 +25,6 @@ void KAddDNSServerDlg::init() { _modified2 = false; addingAlias = false; - makeButtonsResizeable(); } void KAddDNSServerDlg::validateAddressSlot() @@ -55,10 +54,3 @@ void KAddDNSServerDlg::validateAddressSlot() } } } - - -void KAddDNSServerDlg::makeButtonsResizeable() -{ - kpbAddServer->setAutoResize(true); - kpbCancel->setAutoResize(true); -} diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui index 35586fb..8833928 100644 --- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui +++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui @@ -278,13 +278,12 @@ <includes> <include location="local" impldecl="in implementation">kaddknownhostdlg.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">validateAddressSlot()</slot> - <slot access="private">makeButtonsResizeable()</slot> <slot access="private">editHostSlot()</slot> <slot access="private">removeHostSlot()</slot> <slot access="private">addHostSlot()</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> <function specifier="non virtual" returnType="bool">modified()</function> diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h index bbf6e8f..f6465b2 100644 --- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h +++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h @@ -16,7 +16,6 @@ bool _modifiedhost; void KAddKnownHostDlg::init() { _modifiedhost = false; - makeButtonsResizeable(); } void KAddKnownHostDlg::validateAddressSlot() { @@ -37,16 +36,6 @@ void KAddKnownHostDlg::validateAddressSlot() } -void KAddKnownHostDlg::makeButtonsResizeable() -{ - kpbAdd->setAutoResize(true); - kpbCancel->setAutoResize(true); - kpbAddHost->setAutoResize(true); - kpbEditHost->setAutoResize(true); - kpbRemoveHost->setAutoResize(true); -} - - bool KAddKnownHostDlg::modified() { return _modifiedhost; diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui index c392aaf..0447210 100644 --- a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui +++ b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui @@ -94,9 +94,9 @@ <includes> <include location="local" impldecl="in implementation">kinterfaceupdowndlg.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>close()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp index 36d4a46..8a6d6a1 100644 --- a/knetworkconf/knetworkconf/knetworkconf.cpp +++ b/knetworkconf/knetworkconf/knetworkconf.cpp @@ -23,7 +23,6 @@ KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(parent, name) { netInfo = 0L; - makeButtonsResizeable(); config = new KNetworkConfigParser(); klvCardList->setAllColumnsShowFocus(true); klvKnownHosts->setAllColumnsShowFocus(true); @@ -34,14 +33,14 @@ KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNe tooltip = new KProfilesListViewToolTip(klvProfilesList); //Connect signals emmitted by the backend to know when data is ready to be painted. - connect(config,TQT_SIGNAL(readyLoadingNetworkInfo()),this,TQT_SLOT(getNetworkInfoSlot())); - connect(config,TQT_SIGNAL(readyLoadingNetworkInfo()),this,TQT_SLOT(showMainWindow())); - connect(config,TQT_SIGNAL(readyLoadingNetworkInfo()),this,TQT_SLOT(enableSignals())); - connect(config, TQT_SIGNAL(setReadOnly(bool)),this,TQT_SLOT(setReadOnlySlot(bool))); + connect(config,TQ_SIGNAL(readyLoadingNetworkInfo()),this,TQ_SLOT(getNetworkInfoSlot())); + connect(config,TQ_SIGNAL(readyLoadingNetworkInfo()),this,TQ_SLOT(showMainWindow())); + connect(config,TQ_SIGNAL(readyLoadingNetworkInfo()),this,TQ_SLOT(enableSignals())); + connect(config, TQ_SIGNAL(setReadOnly(bool)),this,TQ_SLOT(setReadOnlySlot(bool))); connect(klvCardList, - TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), + TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), this, - TQT_SLOT(showInterfaceContextMenuSlot(TDEListView*,TQListViewItem*, const TQPoint&))); + TQ_SLOT(showInterfaceContextMenuSlot(TDEListView*,TQListViewItem*, const TQPoint&))); // Register with DCOP - No longer needed as now we are a kcontrol module? if ( !kapp->dcopClient()->isRegistered() ) { @@ -152,7 +151,7 @@ void KNetworkConf::loadNetworkDevicesInfo() */ void KNetworkConf::quitSlot(){ int code = 0; - connect( config, TQT_SIGNAL(readyLoadingNetworkInfo()), this, TQT_SLOT(quitSlot()) ); + connect( config, TQ_SIGNAL(readyLoadingNetworkInfo()), this, TQ_SLOT(quitSlot()) ); if (modified) { code = KMessageBox::warningYesNoCancel(this, @@ -571,7 +570,7 @@ void KNetworkConf::disableAll(){ kleDomainName->setReadOnly(true); tlDomainName->setEnabled(false); tlHostName->setEnabled(false); - disconnect(klvCardList,TQT_SIGNAL(doubleClicked(TQListViewItem *)),this,TQT_SLOT(configureDeviceSlot())); + disconnect(klvCardList,TQ_SIGNAL(doubleClicked(TQListViewItem *)),this,TQ_SLOT(configureDeviceSlot())); klvCardList->setEnabled(false); kpbUpButton->setEnabled(false); kpbDownButton->setEnabled(false); @@ -686,7 +685,7 @@ void KNetworkConf::changeDeviceState(const TQString &dev, int state){ dialog->setModal(true); dialog->show(); - procDeviceState = new TQProcess(TQT_TQOBJECT(this)); + procDeviceState = new TQProcess(this); TQString cmd; procDeviceState->addArgument( locate("data",BACKEND_PATH) ); @@ -703,10 +702,10 @@ void KNetworkConf::changeDeviceState(const TQString &dev, int state){ else if (state == DEVICE_DOWN) procDeviceState->addArgument("enable_iface::"+dev+"::0" ); - connect( procDeviceState, TQT_SIGNAL(readyReadStdout()),this, TQT_SLOT(readFromStdoutUpDown()) ); - connect( procDeviceState, TQT_SIGNAL(readyReadStderr()),this, TQT_SLOT(readFromStdErrUpDown()) ); - connect( procDeviceState, TQT_SIGNAL(processExited()),this, TQT_SLOT(verifyDeviceStateChanged()) ); - connect( procDeviceState, TQT_SIGNAL(processExited()), dialog, TQT_SLOT(close()) ); + connect( procDeviceState, TQ_SIGNAL(readyReadStdout()),this, TQ_SLOT(readFromStdoutUpDown()) ); + connect( procDeviceState, TQ_SIGNAL(readyReadStderr()),this, TQ_SLOT(readFromStdErrUpDown()) ); + connect( procDeviceState, TQ_SIGNAL(processExited()),this, TQ_SLOT(verifyDeviceStateChanged()) ); + connect( procDeviceState, TQ_SIGNAL(processExited()), dialog, TQ_SLOT(close()) ); currentDevice = dev; commandOutput = ""; @@ -810,20 +809,6 @@ bool KNetworkConf::valuesChanged(KNetworkInterface *dev, return false; } -/** Sets the TQPushButton::autoResize() in true for all buttons. */ -void KNetworkConf::makeButtonsResizeable(){ - kpbConfigureNetworkInterface->setAutoResize(true); - kcbGwDevice->setAutoResize(true); - kpbAddDomainServer->setAutoResize(true); - kpbEditDomainServer->setAutoResize(true); - kpbRemoveDomainServer->setAutoResize(true); - kpbUpButton->setAutoResize(true); - kpbDownButton->setAutoResize(true); - kpbAddKnownHost->setAutoResize(true); - kpbEditKnownHost->setAutoResize(true); - kpbRemoveKnownHost->setAutoResize(true); -} - void KNetworkConf::enableInterfaceSlot() { if (modified) { @@ -986,8 +971,8 @@ void KNetworkConf::showInterfaceContextMenuSlot(TDEListView* lv, TQListViewItem* TDEPopupMenu *context = new TDEPopupMenu( this ); TQ_CHECK_PTR( context ); - context->insertItem( "&Enable Interface", this, TQT_SLOT(enableInterfaceSlot())); - context->insertItem( "&Disable Interface", this, TQT_SLOT(disableInterfaceSlot())); + context->insertItem( "&Enable Interface", this, TQ_SLOT(enableInterfaceSlot())); + context->insertItem( "&Disable Interface", this, TQ_SLOT(disableInterfaceSlot())); TQListViewItem *item = klvCardList->currentItem(); TQString currentDevice = item->text(0); KNetworkInterface *dev = getDeviceInfo(currentDevice); @@ -1003,17 +988,17 @@ void KNetworkConf::showInterfaceContextMenuSlot(TDEListView* lv, TQListViewItem* context->setItemEnabled(1,false); } context->insertSeparator(2); - context->insertItem( "&Configure Interface...", this, TQT_SLOT(configureDeviceSlot())); + context->insertItem( "&Configure Interface...", this, TQ_SLOT(configureDeviceSlot())); context->popup(pt); - //context->insertItem( "About &TQt", this, TQT_SLOT(aboutTQt()) ); + //context->insertItem( "About &TQt", this, TQ_SLOT(aboutTQt()) ); } void KNetworkConf::enableSignals() { tooltip->setProfiles(netInfo->getProfilesList()); - connect(kleDefaultRoute,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(enableApplyButtonSlot(const TQString&))); - connect(kleDomainName,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(enableApplyButtonSlot(const TQString&))); - connect(kleHostName,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(enableApplyButtonSlot(const TQString&))); + connect(kleDefaultRoute,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(enableApplyButtonSlot(const TQString&))); + connect(kleDomainName,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(enableApplyButtonSlot(const TQString&))); + connect(kleHostName,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(enableApplyButtonSlot(const TQString&))); } void KNetworkConf::enableProfileSlot() @@ -1032,7 +1017,7 @@ void KNetworkConf::enableProfileSlot() profile->setProfilesList(netInfo->getProfilesList()); config->saveNetworkInfo(profile); modified = false; - //connect( config, TQT_SIGNAL(readyLoadingNetworkInfo()), this, TQT_SLOT(showSelectedProfile(selectedProfile)) ); + //connect( config, TQ_SIGNAL(readyLoadingNetworkInfo()), this, TQ_SLOT(showSelectedProfile(selectedProfile)) ); } else KMessageBox::error(this, diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h index 990bef1..cb2d8b4 100644 --- a/knetworkconf/knetworkconf/knetworkconf.h +++ b/knetworkconf/knetworkconf/knetworkconf.h @@ -75,7 +75,7 @@ /** KNetworkConf is the base class of the project */ class KNetworkConf : public KNetworkConfDlg, public DCOPObject { - Q_OBJECT + TQ_OBJECT public: /** construtor */ @@ -175,8 +175,6 @@ class KNetworkConf : public KNetworkConfDlg, public DCOPObject TQString broadcast); /** Returns a list of strings of all the configured devices. */ TQStringList getDeviceList(); - /** Sets the TQPushButton::autoResize() in true for all buttons. */ - void makeButtonsResizeable(); /** Adds a new host to the TDEListView that has the known hosts. */ void addKnownHostSlot(); diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui b/knetworkconf/knetworkconf/knetworkconfdlg.ui index dc77b40..3b83884 100644 --- a/knetworkconf/knetworkconf/knetworkconfdlg.ui +++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui @@ -1043,7 +1043,7 @@ <include location="local" impldecl="in implementation">knetworkconfdlg.ui.h</include> <include location="local" impldecl="in declaration">tqlistview.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">enableButtonsSlot()</slot> <slot access="private">quitSlot()</slot> <slot access="private">moveUpServerSlot()</slot> @@ -1072,7 +1072,7 @@ <slot access="private">updateProfileNameSlot(TQListViewItem *item)</slot> <slot access="private">removeProfileSlot()</slot> <slot access="private">updateProfileSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp index 73bab37..24def66 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp +++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp @@ -52,11 +52,11 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){ procDetect->addArgument( platform ); } procDetect->addArgument( "--get" ); - connect( this, TQT_SIGNAL(readyLoadingNetworkInfo()), dialog, TQT_SLOT(close()) ); - connect( this, TQT_SIGNAL(errorDetectingPlatform()), dialog, TQT_SLOT(close()) ); - connect( procDetect, TQT_SIGNAL(processExited()), this, TQT_SLOT(readNetworkInfo()) ); - connect( procDetect, TQT_SIGNAL(readyReadStdout()),this, TQT_SLOT(concatXMLOutputSlot())); - connect( procDetect, TQT_SIGNAL(readyReadStderr()),this, TQT_SLOT(readXMLErrSlot())); + connect( this, TQ_SIGNAL(readyLoadingNetworkInfo()), dialog, TQ_SLOT(close()) ); + connect( this, TQ_SIGNAL(errorDetectingPlatform()), dialog, TQ_SLOT(close()) ); + connect( procDetect, TQ_SIGNAL(processExited()), this, TQ_SLOT(readNetworkInfo()) ); + connect( procDetect, TQ_SIGNAL(readyReadStdout()),this, TQ_SLOT(concatXMLOutputSlot())); + connect( procDetect, TQ_SIGNAL(readyReadStderr()),this, TQ_SLOT(readXMLErrSlot())); if ( !procDetect->start() ) { @@ -82,9 +82,9 @@ void KNetworkConfigParser::listIfaces(const TQString &platform){ procDetect->addArgument( "-d" ); procDetect->addArgument( "list_ifaces" ); - connect( procDetect, TQT_SIGNAL(processExited()), this, TQT_SLOT(readListIfacesSlot()) ); - connect( procDetect, TQT_SIGNAL(readyReadStdout()),this, TQT_SLOT(concatXMLOutputSlot())); - connect( procDetect, TQT_SIGNAL(readyReadStderr()),this, TQT_SLOT(readXMLErrSlot())); + connect( procDetect, TQ_SIGNAL(processExited()), this, TQ_SLOT(readListIfacesSlot()) ); + connect( procDetect, TQ_SIGNAL(readyReadStdout()),this, TQ_SLOT(concatXMLOutputSlot())); + connect( procDetect, TQ_SIGNAL(readyReadStderr()),this, TQ_SLOT(readXMLErrSlot())); xmlOuput = ""; xmlErr = ""; @@ -221,7 +221,7 @@ KNetworkConfigParser::hexIPv4ToDecIPv4(const TQString &hex) TQString temp = ""; TQString temp2 = ""; -#if Q_BYTE_ORDER == TQ_LITTLE_ENDIAN +#if TQ_BYTE_ORDER == TQ_LITTLE_ENDIAN temp = hex.mid(6,2); temp2 = temp2.setNum(temp.toInt(&ok,16)); dec.append(temp2); @@ -306,13 +306,13 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo) xmlOuput = ""; - connect( this, TQT_SIGNAL(readyLoadingNetworkInfo()), dialog, TQT_SLOT(close()) ); - connect(procSaveNetworkInfo,TQT_SIGNAL(readyReadStdout()),this,TQT_SLOT(readFromStdoutSaveNetworkInfo())); - connect(procSaveNetworkInfo,TQT_SIGNAL(wroteToStdin()),this,TQT_SLOT(sendNetworkInfoSavedSignalSlot())); - connect(procSaveNetworkInfo,TQT_SIGNAL(processExited()),this,TQT_SLOT(listIfacesSlot())); + connect( this, TQ_SIGNAL(readyLoadingNetworkInfo()), dialog, TQ_SLOT(close()) ); + connect(procSaveNetworkInfo,TQ_SIGNAL(readyReadStdout()),this,TQ_SLOT(readFromStdoutSaveNetworkInfo())); + connect(procSaveNetworkInfo,TQ_SIGNAL(wroteToStdin()),this,TQ_SLOT(sendNetworkInfoSavedSignalSlot())); + connect(procSaveNetworkInfo,TQ_SIGNAL(processExited()),this,TQ_SLOT(listIfacesSlot())); processRunning = true; - connect( procSaveNetworkInfo, TQT_SIGNAL(processExited()), this, TQT_SLOT(processExitedSlot()) ); + connect( procSaveNetworkInfo, TQ_SIGNAL(processExited()), this, TQ_SLOT(processExitedSlot()) ); if ( !procSaveNetworkInfo->start() ) { @@ -822,7 +822,7 @@ void KNetworkConfigParser::readNetworkInfo() //user a dialog with all the supported platforms to choose. if (xmlErr.contains("platform_unsup::")) { - connect( this, TQT_SIGNAL(readyLoadingSupportedPlatforms()), this, TQT_SLOT(showSupportedPlatformsDialogSlot()) ); + connect( this, TQ_SIGNAL(readyLoadingSupportedPlatforms()), this, TQ_SLOT(showSupportedPlatformsDialogSlot()) ); loadSupportedPlatforms(); emit errorDetectingPlatform(); } @@ -1004,10 +1004,10 @@ void KNetworkConfigParser::loadSupportedPlatforms(){ procDetect->addArgument( locate("data",BACKEND_PATH) ); procDetect->addArgument( "-d" ); procDetect->addArgument( "platforms" ); - connect( procDetect, TQT_SIGNAL(processExited()), this, TQT_SLOT(readSupportedPlatformsSlot()) ); + connect( procDetect, TQ_SIGNAL(processExited()), this, TQ_SLOT(readSupportedPlatformsSlot()) ); xmlOuput = ""; - connect( procDetect, TQT_SIGNAL(readyReadStdout()),this, TQT_SLOT(concatXMLOutputSlot())); -// connect( procDetect, TQT_SIGNAL(readyReadStderr()),this, TQT_SLOT(readXMLErrSlot())); + connect( procDetect, TQ_SIGNAL(readyReadStdout()),this, TQ_SLOT(concatXMLOutputSlot())); +// connect( procDetect, TQ_SIGNAL(readyReadStderr()),this, TQ_SLOT(readXMLErrSlot())); if ( !procDetect->start() ) { diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.h b/knetworkconf/knetworkconf/knetworkconfigparser.h index 461241d..e8b65d9 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.h +++ b/knetworkconf/knetworkconf/knetworkconfigparser.h @@ -58,7 +58,7 @@ */ class KNetworkConfigParser : public TQObject { - Q_OBJECT + TQ_OBJECT public: KNetworkConfigParser(); diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp index 774bde0..4e3d520 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp +++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp @@ -39,7 +39,7 @@ KNetworkConfModule::KNetworkConfModule(TQWidget* parent, const char *name/*, TQS conf->setReadOnly(true); } - connect(conf,TQT_SIGNAL(networkStateChanged(bool)),TQT_SLOT(configChanged(bool))); + connect(conf,TQ_SIGNAL(networkStateChanged(bool)),TQ_SLOT(configChanged(bool))); setButtons(TDECModule::Apply|TDECModule::Help); } diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.h b/knetworkconf/knetworkconf/knetworkconfmodule.h index 772a65e..ac5f3ff 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.h +++ b/knetworkconf/knetworkconf/knetworkconfmodule.h @@ -24,7 +24,7 @@ class KNetworkConfModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui index acef30e..0bf26aa 100644 --- a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui +++ b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui @@ -72,9 +72,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="autoResize"> - <bool>true</bool> - </property> </widget> <widget class="TQLabel"> <property name="name"> diff --git a/knetworkconf/knetworkconf/tdeselectdistrodlg.ui b/knetworkconf/knetworkconf/tdeselectdistrodlg.ui index daa59b3..ebec1cf 100644 --- a/knetworkconf/knetworkconf/tdeselectdistrodlg.ui +++ b/knetworkconf/knetworkconf/tdeselectdistrodlg.ui @@ -37,9 +37,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -54,9 +51,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -129,9 +123,9 @@ <slot>accept()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>exitSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp index d3451b7..5f0f067 100644 --- a/kpackage/debAptInterface.cpp +++ b/kpackage/debAptInterface.cpp @@ -60,8 +60,8 @@ DEBAPT::DEBAPT():DEB() locatedialog->dLocations(1, 8, this, i18n("Folders", "F"), "Deb", "*.deb", i18n("Location of Folders Containing Debian Packages")); - connect(locatedialog,TQT_SIGNAL(returnVal(LcacheObj *)), - this,TQT_SLOT(setAvail(LcacheObj *))); + connect(locatedialog,TQ_SIGNAL(returnVal(LcacheObj *)), + this,TQ_SLOT(setAvail(LcacheObj *))); locatedialog->apply_slot(); paramsInst.append(new param(i18n("Download only"),FALSE,FALSE,"-d")); @@ -102,19 +102,19 @@ void DEBAPT::makeMenu(TDEActionCollection* act) { updateM = new TDEAction( i18n("&Update"), TQString(), 0, this, - TQT_SLOT(updateS()), act, "debapt_update"); + TQ_SLOT(updateS()), act, "debapt_update"); upgradeM = new TDEAction( i18n("U&pgrade"), TQString(), 0, this, - TQT_SLOT(upgradeS()), act, "debapt_upgrade"); + TQ_SLOT(upgradeS()), act, "debapt_upgrade"); fixupM = new TDEAction( i18n("&Fixup"), TQString(), 0, this, - TQT_SLOT(fixupS()), act, "debapt_fixup"); + TQ_SLOT(fixupS()), act, "debapt_fixup"); fileM = new TDEAction( i18n("&Apt-File Update"), TQString(), 0, this, - TQT_SLOT(fileS()), act, "debapt_file"); + TQ_SLOT(fileS()), act, "debapt_file"); } void DEBAPT::setMenu(TDEActionCollection*, bool enable) diff --git a/kpackage/debAptInterface.h b/kpackage/debAptInterface.h index af5d7d1..c0be5c5 100644 --- a/kpackage/debAptInterface.h +++ b/kpackage/debAptInterface.h @@ -37,7 +37,7 @@ class DEBAPT: public DEB { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/debDpkgInterface.cpp b/kpackage/debDpkgInterface.cpp index cb58908..ddacf75 100644 --- a/kpackage/debDpkgInterface.cpp +++ b/kpackage/debDpkgInterface.cpp @@ -77,8 +77,8 @@ DEBDPKG::DEBDPKG():DEB() locatedialog->dLocations(2, 6, this, i18n("Folders", "F"), "Deb", "*.deb", i18n("Location of Folders Containing Debian Packages")); - connect(locatedialog,TQT_SIGNAL(returnVal(LcacheObj *)), - this,TQT_SLOT(setAvail(LcacheObj *))); + connect(locatedialog,TQ_SIGNAL(returnVal(LcacheObj *)), + this,TQ_SLOT(setAvail(LcacheObj *))); locatedialog->apply_slot(); paramsInst.append(new param(i18n("Allow Downgrade"),TRUE,TRUE,"--refuse-downgrade")); diff --git a/kpackage/debDpkgInterface.h b/kpackage/debDpkgInterface.h index 7fe8064..ff28833 100644 --- a/kpackage/debDpkgInterface.h +++ b/kpackage/debDpkgInterface.h @@ -37,7 +37,7 @@ class cacheObj; class DEBDPKG: public DEB { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/debInterface.h b/kpackage/debInterface.h index 8a0e784..a2b0152 100644 --- a/kpackage/debInterface.h +++ b/kpackage/debInterface.h @@ -53,7 +53,7 @@ class cacheObj; class DEB: public pkgInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/fbsdInterface.cpp b/kpackage/fbsdInterface.cpp index b6d3605..98174e2 100644 --- a/kpackage/fbsdInterface.cpp +++ b/kpackage/fbsdInterface.cpp @@ -74,7 +74,7 @@ fbsdInterface::fbsdInterface():pkgInterface() { i18n("Location of Ports Tree (e.g. /usr/ports or /usr/opt)"),FALSE); locatedialog->dLocations(1, 6, this, i18n("Packages"), "Pkg", "*.tbz", i18n("Location of Folders Containing BSD Packages or Package Trees")); - connect(locatedialog, TQT_SIGNAL(returnVal(LcacheObj *)), this, TQT_SLOT(setAvail(LcacheObj *))); + connect(locatedialog, TQ_SIGNAL(returnVal(LcacheObj *)), this, TQ_SLOT(setAvail(LcacheObj *))); locatedialog->apply_slot(); paramsInst.append(new param(i18n("Ignore Scripts"),FALSE,FALSE,"-I")); diff --git a/kpackage/fbsdInterface.h b/kpackage/fbsdInterface.h index 2d55aa3..074119f 100644 --- a/kpackage/fbsdInterface.h +++ b/kpackage/fbsdInterface.h @@ -46,7 +46,7 @@ class bsdPortsIndexItem; class fbsdInterface : public pkgInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/findf.cpp b/kpackage/findf.cpp index bcb936f..2a39057 100644 --- a/kpackage/findf.cpp +++ b/kpackage/findf.cpp @@ -53,7 +53,7 @@ FindF::FindF(TQWidget *parent) TQFrame *page = makeMainWidget(); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); TQVBoxLayout* vtop = new TQVBoxLayout( page, 10, 10, "vtop"); TQFrame *frame1 = new TQGroupBox(i18n("Find Package"), page, "frame1"); @@ -64,15 +64,15 @@ FindF::FindF(TQWidget *parent) gtop->setSpacing( KDialog::spacingHint() ); value = new TQLineEdit( frame1, "value" ); - connect(value,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); + connect(value,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); value->setFocus(); TQLabel *valueLabel = new TQLabel(value, i18n("Find:"), frame1); valueLabel->setAlignment( AlignRight ); tab = new TDEListView(frame1, "tab"); - connect(tab, TQT_SIGNAL(selectionChanged ( TQListViewItem * )), - this, TQT_SLOT(search( TQListViewItem * ))); + connect(tab, TQ_SIGNAL(selectionChanged ( TQListViewItem * )), + this, TQ_SLOT(search( TQListViewItem * ))); tab->addColumn(i18n("Installed"),18); tab->addColumn(i18n("Type"),110); tab->addColumn("",0); // Hidden column for package type @@ -94,8 +94,8 @@ FindF::FindF(TQWidget *parent) gtop->addWidget(searchAll, 2, 0); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(ok_slot())); - connect(this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(done_slot())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(ok_slot())); + connect(this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(done_slot())); enableButton(User1 , false); show(); diff --git a/kpackage/findf.h b/kpackage/findf.h index 44bd9cd..41d5ecb 100644 --- a/kpackage/findf.h +++ b/kpackage/findf.h @@ -51,7 +51,7 @@ class FindF : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/gentooInterface.h b/kpackage/gentooInterface.h index 8d38794..49eef27 100644 --- a/kpackage/gentooInterface.h +++ b/kpackage/gentooInterface.h @@ -25,7 +25,7 @@ class Gentoo : public pkgInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp index a882d5f..71a2a4e 100644 --- a/kpackage/kissInterface.cpp +++ b/kpackage/kissInterface.cpp @@ -74,8 +74,8 @@ KISS::KISS():pkgInterface() "KISS", "*.installer", i18n("Location of Folders Containing KISS Packages")); - connect(locatedialog,TQT_SIGNAL(returnVal(LcacheObj *)), - this,TQT_SLOT(setAvail(LcacheObj *))); + connect(locatedialog,TQ_SIGNAL(returnVal(LcacheObj *)), + this,TQ_SLOT(setAvail(LcacheObj *))); locatedialog->apply_slot(); queryMsg = i18n("Querying KISS package list: "); diff --git a/kpackage/kissInterface.h b/kpackage/kissInterface.h index 27d2b04..aa44401 100644 --- a/kpackage/kissInterface.h +++ b/kpackage/kissInterface.h @@ -42,7 +42,7 @@ class cacheObj; class KISS: public pkgInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/kpPty.cpp b/kpackage/kpPty.cpp index 7be446f..cb1b416 100644 --- a/kpackage/kpPty.cpp +++ b/kpackage/kpPty.cpp @@ -61,12 +61,12 @@ kpKProcIO::~kpKProcIO() bool kpKProcIO::sstart (RunMode runmode) { - connect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + connect (this, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); - connect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)), - this, TQT_SLOT (sent (TDEProcess *))); + connect (this, TQ_SIGNAL (wroteStdin(TDEProcess *)), + this, TQ_SLOT (sent (TDEProcess *))); return TDEProcess::start (runmode,( TDEProcess::Communication) ( TDEProcess::Stdin | TDEProcess::Stdout)); } @@ -78,13 +78,13 @@ kpPty::kpPty() : TQObject() pty = new kpKProcIO(); pty->setUsePty(TDEProcess::All, false); - connect(pty, TQT_SIGNAL(readReady(KProcIO *)), this, - TQT_SLOT(readLines())); - connect(pty, TQT_SIGNAL(processExited(TDEProcess *)), this, - TQT_SLOT(done())); + connect(pty, TQ_SIGNAL(readReady(KProcIO *)), this, + TQ_SLOT(readLines())); + connect(pty, TQ_SIGNAL(processExited(TDEProcess *)), this, + TQ_SLOT(done())); pty->pty()->setWinSize(0,80); tm = new TQTimer(this); - connect(tm, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(tm, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); eventLoop = FALSE; inSession = FALSE; diff --git a/kpackage/kpPty.h b/kpackage/kpPty.h index bb88a12..3c26180 100644 --- a/kpackage/kpPty.h +++ b/kpackage/kpPty.h @@ -39,7 +39,7 @@ class kpKProcIO: public KProcIO { - Q_OBJECT + TQ_OBJECT public: @@ -53,7 +53,7 @@ public: ////////////////////////////////////////////////////////////////////////////// class kpPty: public TQObject -{ Q_OBJECT +{ TQ_OBJECT public: kpPty(); diff --git a/kpackage/kpTerm.cpp b/kpackage/kpTerm.cpp index 4f49dc4..cc94726 100644 --- a/kpackage/kpTerm.cpp +++ b/kpackage/kpTerm.cpp @@ -51,22 +51,22 @@ kpTerm::kpTerm(kpPty *pt, TQWidget * parent, const char * name ) : void kpTerm::doConnect() { - connect(pty, TQT_SIGNAL(textIn(const TQString &, bool)), this, - TQT_SLOT(textIn(const TQString &, bool))); - connect(pty,TQT_SIGNAL(result(TQStringList &, int)), - this,TQT_SLOT(slotResult(TQStringList &, int))); - connect(this, TQT_SIGNAL(keyOut(char)), pty, - TQT_SLOT(keyOut(char))); + connect(pty, TQ_SIGNAL(textIn(const TQString &, bool)), this, + TQ_SLOT(textIn(const TQString &, bool))); + connect(pty,TQ_SIGNAL(result(TQStringList &, int)), + this,TQ_SLOT(slotResult(TQStringList &, int))); + connect(this, TQ_SIGNAL(keyOut(char)), pty, + TQ_SLOT(keyOut(char))); } void kpTerm::doUnconnect() { - disconnect(pty, TQT_SIGNAL(textIn(const TQString &, bool)), this, - TQT_SLOT(textIn(const TQString &, bool))); - disconnect(pty,TQT_SIGNAL(result(TQStringList &, int)), - this,TQT_SLOT(slotResult(TQStringList &, int))); - disconnect(this, TQT_SIGNAL(keyOut(char)), pty, - TQT_SLOT(keyOut(char))); + disconnect(pty, TQ_SIGNAL(textIn(const TQString &, bool)), this, + TQ_SLOT(textIn(const TQString &, bool))); + disconnect(pty,TQ_SIGNAL(result(TQStringList &, int)), + this,TQ_SLOT(slotResult(TQStringList &, int))); + disconnect(this, TQ_SIGNAL(keyOut(char)), pty, + TQ_SLOT(keyOut(char))); } bool kpTerm::run(const TQString &cmd, TQStringList &r) @@ -182,8 +182,8 @@ kpRun::kpRun( TQWidget *parent) term = new kpTerm(kpty,page); resize(600, 300); - connect(term,TQT_SIGNAL(result(TQStringList &, int)), - this,TQT_SLOT(slotResult(TQStringList &, int))); + connect(term,TQ_SIGNAL(result(TQStringList &, int)), + this,TQ_SLOT(slotResult(TQStringList &, int))); hide(); } diff --git a/kpackage/kpTerm.h b/kpackage/kpTerm.h index 66b7bea..da6254e 100644 --- a/kpackage/kpTerm.h +++ b/kpackage/kpTerm.h @@ -44,7 +44,7 @@ ////////////////////////////////////////////////////////////////////////////// class kpTerm: public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: @@ -72,7 +72,7 @@ signals: class kpRun: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp index b5d51a5..fb1d50f 100644 --- a/kpackage/kpackage.cpp +++ b/kpackage/kpackage.cpp @@ -93,94 +93,94 @@ KPKG::KPKG(TDEConfig *_config) void KPKG::setupMenu() { - pack_open = KStdAction::open(TQT_TQOBJECT(kpackage), TQT_SLOT(fileOpen()), + pack_open = KStdAction::open(kpackage, TQ_SLOT(fileOpen()), actionCollection()); - recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)), + recent = KStdAction::openRecent(this, TQ_SLOT(openRecent(const KURL&)), actionCollection()); recent->loadEntries( config ); pack_find = new TDEAction( i18n("Find &Package..."), "edit-find", - TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(kpackage), - TQT_SLOT(find()), actionCollection(), "pack_find"); + TDEStdAccel::shortcut(TDEStdAccel::Find), kpackage, + TQ_SLOT(find()), actionCollection(), "pack_find"); pack_findf = new TDEAction( i18n("Find &File..."), "filefind", - 0, TQT_TQOBJECT(kpackage), - TQT_SLOT(findf()), actionCollection(), "pack_findf"); + 0, kpackage, + TQ_SLOT(findf()), actionCollection(), "pack_findf"); kpack_reload = new TDEAction( i18n("&Reload"), "reload", - TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(kpackage), - TQT_SLOT(reload()), actionCollection(), "kpack_reload"); + TDEStdAccel::shortcut(TDEStdAccel::Reload), kpackage, + TQ_SLOT(reload()), actionCollection(), "kpack_reload"); - (void) KStdAction::quit(TQT_TQOBJECT(kpackage), TQT_SLOT(fileQuit()), + (void) KStdAction::quit(kpackage, TQ_SLOT(fileQuit()), actionCollection()); - pack_prev = KStdAction::back(TQT_TQOBJECT(kpackage->management->treeList), TQT_SLOT(previous()), + pack_prev = KStdAction::back(kpackage->management->treeList, TQ_SLOT(previous()), actionCollection(),"pack_prev"); - pack_next = KStdAction::forward(TQT_TQOBJECT(kpackage->management->treeList), TQT_SLOT(next()), + pack_next = KStdAction::forward(kpackage->management->treeList, TQ_SLOT(next()), actionCollection(),"pack_next"); (void) (new TDEAction( i18n("&Expand Tree"), "ftout", - 0, TQT_TQOBJECT(kpackage), - TQT_SLOT(expandTree()), actionCollection(), "kpack_expand")); + 0, kpackage, + TQ_SLOT(expandTree()), actionCollection(), "kpack_expand")); (void) (new TDEAction( i18n("&Collapse Tree"), "ftin", - 0, TQT_TQOBJECT(kpackage), - TQT_SLOT(collapseTree()), actionCollection(), "kpack_collapse")); + 0, kpackage, + TQ_SLOT(collapseTree()), actionCollection(), "kpack_collapse")); (void) (new TDEAction( i18n("Clear &Marked"), TQString(), - 0, TQT_TQOBJECT(kpackage), - TQT_SLOT(clearMarked()), actionCollection(), "kpack_clear")); + 0, kpackage, + TQ_SLOT(clearMarked()), actionCollection(), "kpack_clear")); (void) (new TDEAction( i18n("Mark &All"), TQString(), - 0, TQT_TQOBJECT(kpackage), - TQT_SLOT(markAll()), actionCollection(), "kpack_markall")); + 0, kpackage, + TQ_SLOT(markAll()), actionCollection(), "kpack_markall")); pack_install = new TDEAction( i18n("&Install"), TQString(), - 0, TQT_TQOBJECT(kpackage->management), - TQT_SLOT(installSingleClicked()), actionCollection(), "install_single"); + 0, kpackage->management, + TQ_SLOT(installSingleClicked()), actionCollection(), "install_single"); pack_install->setEnabled(false); kpackage->management->setInstallAction(pack_install); pack_uninstall = new TDEAction( i18n("&Uninstall"), TQString(), - 0, TQT_TQOBJECT(kpackage->management), - TQT_SLOT(uninstallSingleClicked()), actionCollection(), "uninstall_single"); + 0, kpackage->management, + TQ_SLOT(uninstallSingleClicked()), actionCollection(), "uninstall_single"); pack_uninstall->setEnabled(false); kpackage->management->setUninstallAction(pack_uninstall); (void) (new TDEAction( i18n("&Install Marked"), TQString(), - 0, TQT_TQOBJECT(kpackage->management), - TQT_SLOT(installMultClicked()), actionCollection(), "install_marked")); + 0, kpackage->management, + TQ_SLOT(installMultClicked()), actionCollection(), "install_marked")); (void) (new TDEAction( i18n("&Uninstall Marked"), TQString(), - 0, TQT_TQOBJECT(kpackage->management), - TQT_SLOT(uninstallMultClicked()), actionCollection(), "uninstall_marked")); + 0, kpackage->management, + TQ_SLOT(uninstallMultClicked()), actionCollection(), "uninstall_marked")); setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), + KStdAction::configureToolbars( this, TQ_SLOT(configureToolBars()), actionCollection()); - KStdAction::saveOptions( TQT_TQOBJECT(this), TQT_SLOT(saveSettings()), actionCollection()); + KStdAction::saveOptions( this, TQ_SLOT(saveSettings()), actionCollection()); - KStdAction::keyBindings( guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); + KStdAction::keyBindings( guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); (void) (new TDEAction( i18n("Configure &KPackage..."), "configure", - 0, TQT_TQOBJECT(this), - TQT_SLOT(setOptions()), actionCollection(), "kpack_options")); + 0, this, + TQ_SLOT(setOptions()), actionCollection(), "kpack_options")); (void) (new TDEAction( i18n("Clear Package &Folder Cache"), TQString(), - 0, TQT_TQOBJECT(this), - TQT_SLOT(clearDCache()), actionCollection(), "clear_dcache")); + 0, this, + TQ_SLOT(clearDCache()), actionCollection(), "clear_dcache")); (void) (new TDEAction( i18n("Clear &Package Cache"), TQString(), - 0, TQT_TQOBJECT(this), - TQT_SLOT(clearPCache()), actionCollection(), "clear_pcache")); + 0, this, + TQ_SLOT(clearPCache()), actionCollection(), "clear_pcache")); int i; for (i = 0; i < kpinterfaceN; i++) { @@ -239,7 +239,7 @@ void KPKG::add_recent_file(const TQString &newfile){ void KPKG::configureToolBars() { KEditToolbar dlg(actionCollection()); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } diff --git a/kpackage/kpackage.h b/kpackage/kpackage.h index dfdcc93..3315e55 100644 --- a/kpackage/kpackage.h +++ b/kpackage/kpackage.h @@ -62,7 +62,7 @@ class kpRun; ////////////////////////////////////////////////////////////////////////////// class KPACKAGE : public TQWidget { - Q_OBJECT + TQ_OBJECT ///////////// METHODS ------------------------------------------------------ @@ -222,7 +222,7 @@ private: class KPKG : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT enum { Tback = 1, diff --git a/kpackage/kplview.cpp b/kpackage/kplview.cpp index 3c38fa6..27bfe72 100644 --- a/kpackage/kplview.cpp +++ b/kpackage/kplview.cpp @@ -97,7 +97,7 @@ void KpTreeList::contentsMousePressEvent ( TQMouseEvent * e ) { bool markUpdate = false; - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { if (inMark(e->x())) { TQPoint vp = contentsToViewport(e->pos()); KpTreeListItem *i = ( KpTreeListItem *)itemAt( vp ); diff --git a/kpackage/kplview.h b/kpackage/kplview.h index 73f5823..4f5eb57 100644 --- a/kpackage/kplview.h +++ b/kpackage/kplview.h @@ -49,7 +49,7 @@ class packageDisplayWidget; //////////////////////////////////////////////////////////////////////// class KpTreeList: public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp index 649d24e..9c515d4 100644 --- a/kpackage/managementWidget.cpp +++ b/kpackage/managementWidget.cpp @@ -91,8 +91,8 @@ managementWidget::managementWidget(TQWidget *parent) setupWidgets(); - connect(treeList,TQT_SIGNAL(updateMarked()), - this, TQT_SLOT( checkMarked())); + connect(treeList,TQ_SIGNAL(updateMarked()), + this, TQ_SLOT( checkMarked())); } managementWidget::~managementWidget() @@ -114,7 +114,7 @@ void managementWidget::setupWidgets() TQTab t; top = new TQBoxLayout(this,TQBoxLayout::TopToBottom); - vPan = new TQSplitter(Qt::Horizontal, this); + vPan = new TQSplitter(TQt::Horizontal, this); top->addWidget(vPan); // the left panel @@ -142,15 +142,15 @@ void managementWidget::setupWidgets() searchLine = new KpListViewSearchLine(searchToolBar, treeList); // searchLine->setKeepParentsVisible(false); - connect( clearSearch, TQT_SIGNAL( pressed() ), searchLine, TQT_SLOT( clear() )); + connect( clearSearch, TQ_SIGNAL( pressed() ), searchLine, TQ_SLOT( clear() )); TQValueList<int> clist; clist.append(0); clist.append(2); searchLine->setSearchColumns(clist); searchToolBar->setStretchableWidget( searchLine ); - connect( treeList, TQT_SIGNAL( cleared() ), searchLine, TQT_SLOT( clear() )); + connect( treeList, TQ_SIGNAL( cleared() ), searchLine, TQ_SLOT( clear() )); - connect(ltab,TQT_SIGNAL(selected (int)),TQT_SLOT(tabChanged(int))); + connect(ltab,TQ_SIGNAL(selected (int)),TQ_SLOT(tabChanged(int))); ltab->setCurrentTab(treeList->treeType); leftbox->addWidget(ltab,10); @@ -163,12 +163,12 @@ void managementWidget::setupWidgets() luinstButton = new TQPushButton(i18n("Uninstall Marked"),leftpanel); luinstButton->setEnabled(FALSE); - connect(luinstButton,TQT_SIGNAL(clicked()), - TQT_SLOT(uninstallMultClicked())); + connect(luinstButton,TQ_SIGNAL(clicked()), + TQ_SLOT(uninstallMultClicked())); linstButton = new TQPushButton(i18n("Install Marked"),leftpanel); linstButton->setEnabled(FALSE); - connect(linstButton,TQT_SIGNAL(clicked()), - TQT_SLOT(installMultClicked())); + connect(linstButton,TQ_SIGNAL(clicked()), + TQ_SLOT(installMultClicked())); leftbox->addLayout(lbuttons,0); // top level layout as child @@ -177,27 +177,27 @@ void managementWidget::setupWidgets() lbuttons->addWidget(luinstButton,1,AlignBottom); lbuttons->addStretch(1); - connect(treeList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(packageHighlighted(TQListViewItem *))); + connect(treeList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(packageHighlighted(TQListViewItem *))); // the right panel rightpanel = new TQFrame(vPan); rightbox = new TQBoxLayout(rightpanel,TQBoxLayout::TopToBottom); packageDisplay = new packageDisplayWidget(rightpanel); - // connect(this, TQT_SIGNAL(changePackage(packageInfo *)), - // packageDisplay, TQT_SLOT(changePackage(packageInfo *))); + // connect(this, TQ_SIGNAL(changePackage(packageInfo *)), + // packageDisplay, TQ_SLOT(changePackage(packageInfo *))); rbuttons = new TQBoxLayout(TQBoxLayout::LeftToRight); uinstButton = new TQPushButton(i18n("Uninstall"),rightpanel); uinstButton->setEnabled(FALSE); - connect(uinstButton,TQT_SIGNAL(clicked()), - TQT_SLOT(uninstallSingleClicked())); + connect(uinstButton,TQ_SIGNAL(clicked()), + TQ_SLOT(uninstallSingleClicked())); instButton = new TQPushButton(i18n("Install"),rightpanel); instButton->setEnabled(FALSE); - connect(instButton,TQT_SIGNAL(clicked()), - TQT_SLOT(installSingleClicked())); + connect(instButton,TQ_SIGNAL(clicked()), + TQ_SLOT(installSingleClicked())); // Setup the `right panel' layout @@ -312,12 +312,12 @@ void managementWidget::collectData(bool refresh) TQApplication::setOverrideCursor( waitCursor ); // stop clear() sending selectionChanged signal - disconnect(treeList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(packageHighlighted(TQListViewItem *))); + disconnect(treeList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(packageHighlighted(TQListViewItem *))); treeList->hide(); // hide list tree treeList->clear(); // empty it - connect(treeList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(packageHighlighted(TQListViewItem *))); + connect(treeList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(packageHighlighted(TQListViewItem *))); packageDisplay->changePackage(0); diff --git a/kpackage/managementWidget.h b/kpackage/managementWidget.h index 5fbe49b..f8fa276 100644 --- a/kpackage/managementWidget.h +++ b/kpackage/managementWidget.h @@ -70,7 +70,7 @@ class managementWidget; class KpListViewSearchLine : public TDEListViewSearchLine { - Q_OBJECT + TQ_OBJECT public: @@ -89,7 +89,7 @@ private: class managementWidget : public TQFrame { - Q_OBJECT + TQ_OBJECT ///////////// METHODS ------------------------------------------------------ diff --git a/kpackage/options.cpp b/kpackage/options.cpp index 3edf36f..22ddeb7 100644 --- a/kpackage/options.cpp +++ b/kpackage/options.cpp @@ -72,15 +72,15 @@ Options::Options(TQWidget *parent) { TQVBox *page = addVBoxPage(i18n("&Types")); - framet = new TQGroupBox(1,Qt::Horizontal,i18n("Handle Package Type"), page); + framet = new TQGroupBox(1,TQt::Horizontal,i18n("Handle Package Type"), page); - hh = new TQGroupBox(1,Qt::Horizontal,i18n("Remote Host"),framet); + hh = new TQGroupBox(1,TQt::Horizontal,i18n("Remote Host"),framet); huse = new TQCheckBox(i18n("Use remote host (Debian APT only):"),hh); - connect(huse, TQT_SIGNAL(clicked()), this, TQT_SLOT(useRemote())); + connect(huse, TQ_SIGNAL(clicked()), this, TQ_SLOT(useRemote())); hosts = new KComboBox( true, hh, "combo" ); TDECompletion *comp = hosts->completionObject(); - connect(hosts,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); - connect(hosts,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(insHosts())); + connect(hosts,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); + connect(hosts,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(insHosts())); hosts->setMaxCount(20); hosts->setDuplicatesEnabled(false); hosts->setInsertionPolicy(TQComboBox::AtTop); @@ -99,11 +99,11 @@ Options::Options(TQWidget *parent) .arg(kpinterface[i]->name) .arg(kpinterface[i]->errExe); } - packageBox[i] = new TQGroupBox(2,Qt::Horizontal,msgStr, framet, "box"); + packageBox[i] = new TQGroupBox(2,TQt::Horizontal,msgStr, framet, "box"); packageHandle[i] = new TQCheckBox(i18n("Enable"), packageBox[i]); - connect(packageHandle[i], TQT_SIGNAL(clicked()), this, TQT_SLOT(scanLocates())); + connect(packageHandle[i], TQ_SIGNAL(clicked()), this, TQ_SLOT(scanLocates())); locate[i] = new TQPushButton(i18n("Location of Packages"),packageBox[i]); - connect(locate[i], TQT_SIGNAL(clicked()), kpinterface[i], TQT_SLOT(setLocation())); + connect(locate[i], TQ_SIGNAL(clicked()), kpinterface[i], TQ_SLOT(setLocation())); } else { packageHandle[i] = 0; } @@ -115,7 +115,7 @@ Options::Options(TQWidget *parent) bc = new TQButtonGroup(page); bc->setTitle(i18n("Cache Remote Package Folders")); - connect( bc, TQT_SIGNAL(clicked(int)), TQT_SLOT(PDCache(int)) ); + connect( bc, TQ_SIGNAL(clicked(int)), TQ_SLOT(PDCache(int)) ); TQVBoxLayout* vc = new TQVBoxLayout( bc, 15, 10, "vc"); vc->addSpacing( bc->fontMetrics().height() ); @@ -131,7 +131,7 @@ Options::Options(TQWidget *parent) bp = new TQButtonGroup(page); bp->setTitle(i18n("Cache Remote Package Files")); - connect( bp, TQT_SIGNAL(clicked(int)), TQT_SLOT(PPCache(int)) ); + connect( bp, TQ_SIGNAL(clicked(int)), TQ_SLOT(PPCache(int)) ); TQVBoxLayout* vp = new TQVBoxLayout( bp, 15, 10, "vp"); vp->addSpacing( bp->fontMetrics().height() ); @@ -145,7 +145,7 @@ Options::Options(TQWidget *parent) pcache[2] = new TQRadioButton(i18n("Never"),bp); vp->addWidget(pcache[2]); - TQGroupBox* cd = new TQGroupBox (1, Qt::Horizontal, i18n("Cache Folder"), page) ; + TQGroupBox* cd = new TQGroupBox (1, TQt::Horizontal, i18n("Cache Folder"), page) ; cd->setSizePolicy (TQSizePolicy::Expanding, TQSizePolicy::Fixed) ; cachedir = new KURLRequester("", cd, "cachedir"); @@ -160,7 +160,7 @@ Options::Options(TQWidget *parent) bs = new TQButtonGroup(page); bs->setTitle(i18n("Execute Privileged Commands Using")); - connect( bs, TQT_SIGNAL(clicked(int)), TQT_SLOT(PPrivs(int)) ); + connect( bs, TQ_SIGNAL(clicked(int)), TQ_SLOT(PPrivs(int)) ); TQVBoxLayout* vs = new TQVBoxLayout( bs, 15, 10, "bs"); vs->addSpacing( bs->fontMetrics().height() ); @@ -183,9 +183,9 @@ Options::Options(TQWidget *parent) vf->addSpacing(100); } - connect( this, TQT_SIGNAL(okClicked()), TQT_SLOT(apply_slot()) ); - connect( this, TQT_SIGNAL(closeClicked()), TQT_SLOT(cancel_slot()) ); - connect( this, TQT_SIGNAL(cancelClicked()), TQT_SLOT(cancel_slot()) ); + connect( this, TQ_SIGNAL(okClicked()), TQ_SLOT(apply_slot()) ); + connect( this, TQ_SIGNAL(closeClicked()), TQ_SLOT(cancel_slot()) ); + connect( this, TQ_SIGNAL(cancelClicked()), TQ_SLOT(cancel_slot()) ); setValues(); diff --git a/kpackage/options.h b/kpackage/options.h index 375c0c1..63a37a3 100644 --- a/kpackage/options.h +++ b/kpackage/options.h @@ -61,7 +61,7 @@ class TQRadioButton; ////////////////////////////////////////////////////////////////////////////// class Options : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/packageDisplay.cpp b/kpackage/packageDisplay.cpp index 57d1ed7..e7a4114 100644 --- a/kpackage/packageDisplay.cpp +++ b/kpackage/packageDisplay.cpp @@ -87,10 +87,10 @@ void packageDisplayWidget::setupWidgets() packageProperties = new packagePropertiesWidget(proptab); fileList = new kpFileList(fltab, this); - connect(fileList, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT( openBinding(TQListViewItem *)) ); - connect(fileList, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT( openBinding(TQListViewItem *)) ); + connect(fileList, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT( openBinding(TQListViewItem *)) ); + connect(fileList, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT( openBinding(TQListViewItem *)) ); changeLog = new TQTextEdit(cltab); @@ -105,7 +105,7 @@ void packageDisplayWidget::setupWidgets() if (isTabEnabled(proptab)) setTabEnabled(proptab,false); - connect(this,TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(tabSelected(TQWidget *))); + connect(this,TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(tabSelected(TQWidget *))); } void packageDisplayWidget::tabSelected(TQWidget *tab) @@ -116,7 +116,7 @@ void packageDisplayWidget::tabSelected(TQWidget *tab) void packageDisplayWidget::tabSet(TQWidget *tab) { - disconnect(this,TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(tabSelected(TQWidget *))); + disconnect(this,TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(tabSelected(TQWidget *))); if(tab == proptab) { packageProperties->show(); fileList->hide(); @@ -146,12 +146,12 @@ void packageDisplayWidget::tabSet(TQWidget *tab) } setCurrentPage(2); } - connect(this,TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(tabSelected(TQWidget *))); + connect(this,TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(tabSelected(TQWidget *))); } void packageDisplayWidget::noPackage() { - disconnect(this,TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(tabSelected(TQWidget *))); + disconnect(this,TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(tabSelected(TQWidget *))); if (isTabEnabled(fltab)) { fileList->setColumnText(0,""); @@ -168,7 +168,7 @@ void packageDisplayWidget::noPackage() fileList->clear(); changeLog->setText(""); - connect(this,TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(tabSelected(TQWidget *))); + connect(this,TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(tabSelected(TQWidget *))); } // Change packages @@ -177,12 +177,12 @@ void packageDisplayWidget::changePackage(packageInfo *p) // This is to stop selectionChanged firing off here - disconnect(fileList, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT( openBinding(TQListViewItem *)) ); - disconnect(fileList, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT( openBinding(TQListViewItem *)) ); - disconnect(fileList, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - fileList, TQT_SLOT( openContext(TDEListView *, TQListViewItem *, const TQPoint &)) ); + disconnect(fileList, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT( openBinding(TQListViewItem *)) ); + disconnect(fileList, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT( openBinding(TQListViewItem *)) ); + disconnect(fileList, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), + fileList, TQ_SLOT( openContext(TDEListView *, TQListViewItem *, const TQPoint &)) ); if (package && package != p) { @@ -230,12 +230,12 @@ void packageDisplayWidget::changePackage(packageInfo *p) } - connect(fileList, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT( openBinding(TQListViewItem *)) ); - connect(fileList, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT( openBinding(TQListViewItem *)) ); - connect(fileList, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - fileList, TQT_SLOT( openContext(TDEListView *, TQListViewItem *, const TQPoint &)) ); + connect(fileList, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT( openBinding(TQListViewItem *)) ); + connect(fileList, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT( openBinding(TQListViewItem *)) ); + connect(fileList, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), + fileList, TQ_SLOT( openContext(TDEListView *, TQListViewItem *, const TQPoint &)) ); } @@ -368,11 +368,11 @@ void packageDisplayWidget::updateFileList() hide(); addColumn("name"); setRootIsDecorated(TRUE); - connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - this, TQT_SLOT( openContext(TDEListView *, TQListViewItem *, const TQPoint &)) ); + connect(this, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), + this, TQ_SLOT( openContext(TDEListView *, TQListViewItem *, const TQPoint &)) ); FileListMenu = new TDEPopupMenu(); - openwith = FileListMenu->insertItem(i18n("&Open With..."),parent2,TQT_SLOT(__openBindingWith())); + openwith = FileListMenu->insertItem(i18n("&Open With..."),parent2,TQ_SLOT(__openBindingWith())); pkDisplay = parent2; } diff --git a/kpackage/packageDisplay.h b/kpackage/packageDisplay.h index 5a1faf4..2402c87 100644 --- a/kpackage/packageDisplay.h +++ b/kpackage/packageDisplay.h @@ -56,7 +56,7 @@ class TQTextEdit; class packageDisplayWidget; class kpFileList : public TDEListView { - Q_OBJECT + TQ_OBJECT public: @@ -85,7 +85,7 @@ public slots: class packageDisplayWidget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT friend class kpFileList; diff --git a/kpackage/packageProperties.h b/kpackage/packageProperties.h index 75a6ee8..6de512d 100644 --- a/kpackage/packageProperties.h +++ b/kpackage/packageProperties.h @@ -51,7 +51,7 @@ class packageInfo; class packagePropertiesWidget : public KTextBrowser { - Q_OBJECT + TQ_OBJECT ///////////// METHODS ------------------------------------------------------ public: diff --git a/kpackage/pkgInterface.h b/kpackage/pkgInterface.h index 05d4089..be7346c 100644 --- a/kpackage/pkgInterface.h +++ b/kpackage/pkgInterface.h @@ -68,7 +68,7 @@ public: ////////////////////////////////////////////////////////////////////////////// class pkgInterface: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp index acf9c4f..f90a7a2 100644 --- a/kpackage/pkgOptions.cpp +++ b/kpackage/pkgOptions.cpp @@ -79,8 +79,6 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars) f.setBold(true); f.setPointSize(f.pointSize()+6); title->setFont(f); - // title->setAutoResize(TRUE); - // title->update(); installButton = new TQPushButton(insType,this); cancelButton = new KPushButton(KStdGuiItem::cancel(),this); @@ -98,9 +96,9 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars) Keep = new TQCheckBox(i18n("Keep this window"), this); // Connections - connect(installButton,TQT_SIGNAL(clicked()),TQT_SLOT(pkginstallButtonClicked())); - connect(cancelButton,TQT_SIGNAL(clicked()),TQT_SLOT(cancelButtonClicked())); - connect(Keep, TQT_SIGNAL(toggled(bool)), TQT_SLOT(keepToggle(bool))); + connect(installButton,TQ_SIGNAL(clicked()),TQ_SLOT(pkginstallButtonClicked())); + connect(cancelButton,TQ_SIGNAL(clicked()),TQ_SLOT(cancelButtonClicked())); + connect(Keep, TQ_SIGNAL(toggled(bool)), TQ_SLOT(keepToggle(bool))); // Do the layout vlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, marginHint(), spacingHint()); @@ -116,8 +114,8 @@ void pkgOptions::setupWidgets(TQPtrList<param> &pars) layout->addWidget(packages,20); packages->addColumn(i18n("PACKAGES"),200); - connect(packages, TQT_SIGNAL(selectionChanged ( TQListViewItem * )), - this, TQT_SLOT(slotSearch( TQListViewItem * ))); + connect(packages, TQ_SIGNAL(selectionChanged ( TQListViewItem * )), + this, TQ_SLOT(slotSearch( TQListViewItem * ))); layout->addStretch(1); for (i = 0; i < bnumber; i++) { @@ -238,8 +236,8 @@ void pkgOptions::pkginstallButtonClicked() } else if (s.left(2) == "1=") { term->textIn(s.mid(2), true); } else { - connect(term,TQT_SIGNAL(result(TQStringList &, int)), - this,TQT_SLOT(slotResult(TQStringList &, int))); + connect(term,TQ_SIGNAL(result(TQStringList &, int)), + this,TQ_SLOT(slotResult(TQStringList &, int))); installButton->setEnabled(FALSE); @@ -269,8 +267,8 @@ void pkgOptions::slotSearch(TQListViewItem *item) void pkgOptions::reset() { installButton->setEnabled(TRUE); cancelButton->setGuiItem(KGuiItem(i18n("Done"))); //clear icon - disconnect(term,TQT_SIGNAL(result(TQStringList &, int)), - this,TQT_SLOT(slotResult(TQStringList &, int))); + disconnect(term,TQ_SIGNAL(result(TQStringList &, int)), + this,TQ_SLOT(slotResult(TQStringList &, int))); running = FALSE; } diff --git a/kpackage/pkgOptions.h b/kpackage/pkgOptions.h index 1d93708..22a8c8e 100644 --- a/kpackage/pkgOptions.h +++ b/kpackage/pkgOptions.h @@ -51,7 +51,7 @@ class KPushButton; class pkgOptions : public KDialog { - Q_OBJECT + TQ_OBJECT public: pkgOptions( pkgInterface *pki, TQWidget *parent=0, const TQString &caption=TQString()); @@ -133,7 +133,7 @@ protected: /////////////////////////////////////////////////////////////////////////// class pkgOptionsI: public pkgOptions { - Q_OBJECT + TQ_OBJECT public: pkgOptionsI(pkgInterface *pkg, TQWidget *parent = 0); @@ -144,7 +144,7 @@ public: /////////////////////////////////////////////////////////////////////////// class pkgOptionsU: public pkgOptions { - Q_OBJECT + TQ_OBJECT public: pkgOptionsU(pkgInterface *pkg, TQWidget *parent = 0); diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp index 122bf18..73372fa 100644 --- a/kpackage/procbuf.cpp +++ b/kpackage/procbuf.cpp @@ -37,8 +37,6 @@ Modal::Modal(TQString msg, TQWidget *parent, const char * name ) { TQLabel *line1 = new TQLabel(msg,this); line1->setAlignment(AlignCenter); - line1->setAutoResize(true); - } void Modal::terminate() @@ -50,7 +48,7 @@ procbuf::procbuf() { m = NULL; tm = new TQTimer(this); - connect(tm, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(tm, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } procbuf::~procbuf() @@ -61,12 +59,12 @@ void procbuf::setup(TQString cmd) { buf.truncate(0); proc = new TDEProcess(); - connect(proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReadInfo(TDEProcess *, char *, int))); - connect(proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotReadInfo(TDEProcess *, char *, int))); - connect(proc, TQT_SIGNAL( processExited(TDEProcess *)), - this, TQT_SLOT(slotExited(TDEProcess *))); + connect(proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReadInfo(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotReadInfo(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL( processExited(TDEProcess *)), + this, TQ_SLOT(slotExited(TDEProcess *))); proc->clearArguments(); *proc << cmd; command = cmd; diff --git a/kpackage/procbuf.h b/kpackage/procbuf.h index b502621..7ba2a6e 100644 --- a/kpackage/procbuf.h +++ b/kpackage/procbuf.h @@ -36,7 +36,7 @@ #define PROCBUF class Modal : public KDialog { - Q_OBJECT + TQ_OBJECT public: Modal(TQString msg, TQWidget *parent, const char * name ); @@ -45,7 +45,7 @@ public: class procbuf: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp index 66d4154..8a37844 100644 --- a/kpackage/rpmInterface.cpp +++ b/kpackage/rpmInterface.cpp @@ -59,8 +59,8 @@ RPM::RPM():pkgInterface() locatedialog->dLocations(7,6, this, i18n("Folder","F"), "Rpm","*.rpm", i18n("Location of Folders Containing RPM Packages")); - connect(locatedialog,TQT_SIGNAL(returnVal(LcacheObj *)), - this,TQT_SLOT(setAvail(LcacheObj *))); + connect(locatedialog,TQ_SIGNAL(returnVal(LcacheObj *)), + this,TQ_SLOT(setAvail(LcacheObj *))); locatedialog->apply_slot(); paramsInst.append(new param(i18n("Upgrade"),TRUE,FALSE,"-U","-i")); diff --git a/kpackage/rpmInterface.h b/kpackage/rpmInterface.h index 8113284..36d18de 100644 --- a/kpackage/rpmInterface.h +++ b/kpackage/rpmInterface.h @@ -40,7 +40,7 @@ class cacheObj; class RPM : public pkgInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/search.cpp b/kpackage/search.cpp index 2dc8979..3782257 100644 --- a/kpackage/search.cpp +++ b/kpackage/search.cpp @@ -43,7 +43,7 @@ Search::Search(TQWidget *parent, const char * name) { TQFrame *page = makeMainWidget(); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); TQVBoxLayout* vtop = new TQVBoxLayout( page, 10, 10, "vtop"); @@ -56,7 +56,7 @@ Search::Search(TQWidget *parent, const char * name) value->setFocus(); value->setFixedHeight(value->sizeHint().height()); value->setMinimumWidth(250); - connect(value, TQT_SIGNAL(textChanged(const TQString &)),this, TQT_SLOT(textChanged(const TQString &))); + connect(value, TQ_SIGNAL(textChanged(const TQString &)),this, TQ_SLOT(textChanged(const TQString &))); TQHBoxLayout* hc = new TQHBoxLayout( ); vf->addLayout(hc,0); @@ -74,8 +74,8 @@ Search::Search(TQWidget *parent, const char * name) enableButton( User1, false ); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(ok_slot())); - connect(this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(done_slot())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(ok_slot())); + connect(this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(done_slot())); show(); } diff --git a/kpackage/search.h b/kpackage/search.h index 0fc2b4d..1207336 100644 --- a/kpackage/search.h +++ b/kpackage/search.h @@ -45,7 +45,7 @@ class TQCheckBox; class Search : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/slackInterface.cpp b/kpackage/slackInterface.cpp index 84e07a6..bf2be7b 100644 --- a/kpackage/slackInterface.cpp +++ b/kpackage/slackInterface.cpp @@ -92,8 +92,8 @@ SLACK::SLACK():pkgInterface() "Slackware", "*.tgz *.tar.gz", i18n("Location of Folders Containing Slackware Packages")); - connect(locatedialog,TQT_SIGNAL(returnVal(LcacheObj *)), - this,TQT_SLOT(setAvail(LcacheObj *))); + connect(locatedialog,TQ_SIGNAL(returnVal(LcacheObj *)), + this,TQ_SLOT(setAvail(LcacheObj *))); locatedialog->apply_slot(); paramsInst.append(new param(i18n("Test (do not install)"),FALSE,FALSE,"-warn")); diff --git a/kpackage/slackInterface.h b/kpackage/slackInterface.h index 5f3958a..bfb2c33 100644 --- a/kpackage/slackInterface.h +++ b/kpackage/slackInterface.h @@ -40,7 +40,7 @@ class cacheObj; class SLACK: public pkgInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/tdeio.cpp b/kpackage/tdeio.cpp index 6ecfd34..6669137 100644 --- a/kpackage/tdeio.cpp +++ b/kpackage/tdeio.cpp @@ -35,8 +35,8 @@ Kio::Kio() bool Kio::download(const KURL & from, const TQString & to) { TDEIO::Job *iojob = TDEIO::file_copy(from, to); - connect( iojob, TQT_SIGNAL( result(TDEIO::Job*) ), - TQT_SLOT( slotIOJobFinished( TDEIO::Job* ))); + connect( iojob, TQ_SIGNAL( result(TDEIO::Job*) ), + TQ_SLOT( slotIOJobFinished( TDEIO::Job* ))); // missing modal widget hack here. // I'd recommend using TDEIO::NetAccess instead (David). kapp->enter_loop(); @@ -76,10 +76,10 @@ bool Kiod::listDir(const TQString &url, const TQString &fname, bool subdirs) kdDebug() << "started " << job << " " << subdirs << endl; - TQObject::connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( slotListEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); - TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + TQObject::connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( slotListEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + TQObject::connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); kapp->enter_loop(); diff --git a/kpackage/tdeio.h b/kpackage/tdeio.h index 30c35b8..524dd4f 100644 --- a/kpackage/tdeio.h +++ b/kpackage/tdeio.h @@ -39,7 +39,7 @@ class Kio: public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -56,7 +56,7 @@ private slots: class Kiod: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp index 4bee494..8d89602 100644 --- a/kpackage/updateLoc.cpp +++ b/kpackage/updateLoc.cpp @@ -114,7 +114,7 @@ dpanel::dpanel( TQWidget *parent, const char * name ) pbut = new TQPushButton("...",this); pack->addWidget(pbut,0); - connect(pbut, TQT_SIGNAL(clicked()), this, TQT_SLOT(dirOpen())); + connect(pbut, TQ_SIGNAL(clicked()), this, TQ_SLOT(dirOpen())); } } @@ -148,9 +148,9 @@ dpanel::dpanel(dpanel *basep, const TQString &Pfilter, bool bsubdirs, pack->addWidget(pbut,0); if (base) - connect(pbut, TQT_SIGNAL(clicked()), this, TQT_SLOT(fileOpen())); + connect(pbut, TQ_SIGNAL(clicked()), this, TQ_SLOT(fileOpen())); else - connect(pbut, TQT_SIGNAL(clicked()), this, TQT_SLOT(dirOpen())); + connect(pbut, TQ_SIGNAL(clicked()), this, TQ_SLOT(dirOpen())); } } @@ -271,7 +271,7 @@ void updateLoc::doBase(const TQString & bmsg) base = 0; if (haveBase) { fbase = new TQGroupBox(bmsg, this); - fbase->setColumnLayout(0, Qt::Vertical ); + fbase->setColumnLayout(0, TQt::Vertical ); fbase->layout()->setSpacing( KDialog::spacingHint() ); fbase->layout()->setMargin( KDialog::marginHint() ); vbase = new TQVBoxLayout(fbase->layout()); @@ -297,7 +297,7 @@ aUpdateLoc::aUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, const ap[0] = 0; - TQGroupBox *floc = new TQGroupBox(1,Qt::Vertical, label, this); + TQGroupBox *floc = new TQGroupBox(1,TQt::Vertical, label, this); vf->addWidget(floc,1); TQScrollView* sv = new TQScrollView(floc); sv->setHScrollBarMode(TQScrollView::AlwaysOff); @@ -409,7 +409,7 @@ pdUpdateLoc::pdUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, cons doBase(bmsg); TQGroupBox *floc = new TQGroupBox(lmsg, this); - floc->setColumnLayout(0, Qt::Vertical ); + floc->setColumnLayout(0, TQt::Vertical ); floc->layout()->setSpacing( KDialog::spacingHint() ); floc->layout()->setMargin( KDialog::marginHint() ); vf->addWidget(floc,1); @@ -546,7 +546,7 @@ cUpdateLoc::cUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, const for (int i = 0; i < numLines; i++) { TQGroupBox *floc = new TQGroupBox(*kcIt, this); - floc->setColumnLayout(0, Qt::Vertical ); + floc->setColumnLayout(0, TQt::Vertical ); floc->layout()->setSpacing( KDialog::spacingHint() ); floc->layout()->setMargin( KDialog::marginHint() ); vf->addWidget(floc,1); @@ -554,8 +554,8 @@ cUpdateLoc::cUpdateLoc(TQWidget *p, int panelNumber, pkgInterface *inter, const combo[i] = new KComboBox( true, floc); TDECompletion *comp = combo[i]->completionObject(); - connect(combo[i],TQT_SIGNAL(returnPressed(const TQString&)) - ,comp,TQT_SLOT(addItem(const TQString&))); + connect(combo[i],TQ_SIGNAL(returnPressed(const TQString&)) + ,comp,TQ_SLOT(addItem(const TQString&))); combo[i]->insertStringList(TQStringList::split(' ',*ocIt)); vloc->addWidget(combo[i]); if (kcIt != kc.end()) { @@ -647,7 +647,7 @@ Locations::Locations(const TQString &msg) { numPanels = 0; - connect( this, TQT_SIGNAL(okClicked()), TQT_SLOT(write_slot()) ); + connect( this, TQ_SIGNAL(okClicked()), TQ_SLOT(write_slot()) ); } void Locations::dLocations(int numberDirs, int numberLines, diff --git a/kpackage/updateLoc.h b/kpackage/updateLoc.h index 5c48b81..7dd49aa 100644 --- a/kpackage/updateLoc.h +++ b/kpackage/updateLoc.h @@ -59,7 +59,7 @@ class KComboBox; ////////////////////////////////////////////////////////////////////////////// class dpanel : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -97,7 +97,7 @@ private: ////////////////////////////////////////////////////////////////////////////// class apanel : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -127,7 +127,7 @@ private: ////////////////////////////////////////////////////////////////////////////// class updateLoc : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -160,7 +160,7 @@ public: ////////////////////////////////////////////////////////////////////////////// class aUpdateLoc : public updateLoc { - Q_OBJECT + TQ_OBJECT public: @@ -200,7 +200,7 @@ private: ////////////////////////////////////////////////////////////////////////////// class pdUpdateLoc : public updateLoc { - Q_OBJECT + TQ_OBJECT public: @@ -242,7 +242,7 @@ private: ////////////////////////////////////////////////////////////////////////////// class cUpdateLoc : public updateLoc { - Q_OBJECT + TQ_OBJECT public: @@ -284,7 +284,7 @@ private: class Locations : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/ActionList.h b/ksysv/ActionList.h index 4af1f84..68290f5 100644 --- a/ksysv/ActionList.h +++ b/ksysv/ActionList.h @@ -105,7 +105,7 @@ private: class ActionList : public TQObject, private TQPtrStack<KSVAction> { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp index 37dd2d4..5825f6f 100644 --- a/ksysv/OldView.cpp +++ b/ksysv/OldView.cpp @@ -73,7 +73,7 @@ #include "TopWidget.h" KSVContent::KSVContent (TDEPopupMenu* openWithMenu, KSVTopLevel* parent, const char* name) - : TQSplitter (Qt::Vertical, parent, name), + : TQSplitter (TQt::Vertical, parent, name), startRL (new KSVDragList*[ksv::runlevelNumber]), stopRL (new KSVDragList*[ksv::runlevelNumber]), conf(KSVConfig::self()), @@ -102,12 +102,12 @@ KSVContent::KSVContent (TDEPopupMenu* openWithMenu, KSVTopLevel* parent, const c // watch services dir KDirWatch* dirwatch = KDirWatch::self(); dirwatch->addDir (conf->scriptPath ()); - connect (dirwatch, TQT_SIGNAL (dirty (const TQString&)), - this, TQT_SLOT (updateServicesAfterChange (const TQString&))); - connect (dirwatch, TQT_SIGNAL (created (const TQString&)), - this, TQT_SLOT (updateServicesAfterChange (const TQString&))); - connect (dirwatch, TQT_SIGNAL (deleted (const TQString&)), - this, TQT_SLOT (updateServicesAfterChange (const TQString&))); + connect (dirwatch, TQ_SIGNAL (dirty (const TQString&)), + this, TQ_SLOT (updateServicesAfterChange (const TQString&))); + connect (dirwatch, TQ_SIGNAL (created (const TQString&)), + this, TQ_SLOT (updateServicesAfterChange (const TQString&))); + connect (dirwatch, TQ_SIGNAL (deleted (const TQString&)), + this, TQ_SLOT (updateServicesAfterChange (const TQString&))); setSizes(KSVContent::panningFactorToSplitter (conf->panningFactor())); @@ -126,7 +126,7 @@ KSVContent::KSVContent (TDEPopupMenu* openWithMenu, KSVTopLevel* parent, const c textDisplay->setStyleSheet (ksv::styleSheet()); // Open With... menu - connect (mOpenWithMenu, TQT_SIGNAL (activated (int)), this, TQT_SLOT (openWith (int))); + connect (mOpenWithMenu, TQ_SIGNAL (activated (int)), this, TQ_SLOT (openWith (int))); calcMinSize(); } @@ -219,25 +219,25 @@ void KSVContent::initLList() servL->setBuddy(scripts); // doubleclick && return - connect (scripts, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotScriptProperties(TQListViewItem*))); - connect (scripts, TQT_SIGNAL (returnPressed (TQListViewItem*)), - this, TQT_SLOT (slotScriptProperties (TQListViewItem*))); + connect (scripts, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotScriptProperties(TQListViewItem*))); + connect (scripts, TQ_SIGNAL (returnPressed (TQListViewItem*)), + this, TQ_SLOT (slotScriptProperties (TQListViewItem*))); // context menus - connect (scripts, TQT_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT (popupServicesMenu (TDEListView*, TQListViewItem*, const TQPoint&))); + connect (scripts, TQ_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT (popupServicesMenu (TDEListView*, TQListViewItem*, const TQPoint&))); // for cut & copy - connect (scripts, TQT_SIGNAL (newOrigin ()), - this, TQT_SLOT (fwdOrigin ())); + connect (scripts, TQ_SIGNAL (newOrigin ()), + this, TQ_SLOT (fwdOrigin ())); // for origin updates - connect (scripts, TQT_SIGNAL (newOrigin (KSVDragList*)), - this, TQT_SLOT (fwdOrigin (KSVDragList*))); + connect (scripts, TQ_SIGNAL (newOrigin (KSVDragList*)), + this, TQ_SLOT (fwdOrigin (KSVDragList*))); trash = new KSVTrash(mScriptBox, "Trash"); - connect (trash, TQT_SIGNAL (undoAction (KSVAction*)), this, TQT_SLOT (fwdUndoAction (KSVAction*))); + connect (trash, TQ_SIGNAL (undoAction (KSVAction*)), this, TQ_SLOT (fwdUndoAction (KSVAction*))); TQWhatsThis::add (trash, i18n ("<p>You can drag services from a runlevel onto " \ "the <img src=\"small|trash\"/> <strong>trashcan</strong> to " \ @@ -290,21 +290,21 @@ void KSVContent::initLList() rlL->setBuddy(startRL[i]); // for cut'n'paste - connect (startRL[i], TQT_SIGNAL (newOrigin ()), - this, TQT_SLOT (fwdOrigin ())); - connect (startRL[i], TQT_SIGNAL (newOrigin (KSVDragList*)), - this, TQT_SLOT (fwdOrigin (KSVDragList*))); - - connect (stopRL[i], TQT_SIGNAL (newOrigin ()), - this, TQT_SLOT (fwdOrigin ())); - connect (stopRL[i], TQT_SIGNAL (newOrigin (KSVDragList*)), - this, TQT_SLOT (fwdOrigin (KSVDragList*))); + connect (startRL[i], TQ_SIGNAL (newOrigin ()), + this, TQ_SLOT (fwdOrigin ())); + connect (startRL[i], TQ_SIGNAL (newOrigin (KSVDragList*)), + this, TQ_SLOT (fwdOrigin (KSVDragList*))); + + connect (stopRL[i], TQ_SIGNAL (newOrigin ()), + this, TQ_SLOT (fwdOrigin ())); + connect (stopRL[i], TQ_SIGNAL (newOrigin (KSVDragList*)), + this, TQ_SLOT (fwdOrigin (KSVDragList*))); } lay->addStretch(1); - connect (scripts, TQT_SIGNAL(undoAction(KSVAction*)), - this, TQT_SLOT(fwdUndoAction(KSVAction*))); + connect (scripts, TQ_SIGNAL(undoAction(KSVAction*)), + this, TQ_SLOT(fwdUndoAction(KSVAction*))); // add text-diplay widget textDisplay = new TQTextEdit( TQString(), TQString(), this, "TextDisplayWidget" ); @@ -313,41 +313,41 @@ void KSVContent::initLList() for (int i = 0; i < ksv::runlevelNumber; ++i) { - connect (startRL[i], TQT_SIGNAL(newOrigin()), stopRL[i], TQT_SLOT(slotNewOrigin())); - connect (stopRL[i], TQT_SIGNAL(newOrigin()), startRL[i], TQT_SLOT(slotNewOrigin())); + connect (startRL[i], TQ_SIGNAL(newOrigin()), stopRL[i], TQ_SLOT(slotNewOrigin())); + connect (stopRL[i], TQ_SIGNAL(newOrigin()), startRL[i], TQ_SLOT(slotNewOrigin())); - connect (startRL[i], TQT_SIGNAL(undoAction(KSVAction*)), - this, TQT_SLOT(fwdUndoAction(KSVAction*))); - connect (stopRL[i], TQT_SIGNAL(undoAction(KSVAction*)), - this, TQT_SLOT(fwdUndoAction(KSVAction*))); + connect (startRL[i], TQ_SIGNAL(undoAction(KSVAction*)), + this, TQ_SLOT(fwdUndoAction(KSVAction*))); + connect (stopRL[i], TQ_SIGNAL(undoAction(KSVAction*)), + this, TQ_SLOT(fwdUndoAction(KSVAction*))); // doubleclick && return - connect (startRL[i], TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotDoubleClick(TQListViewItem*))); - connect (stopRL[i], TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotDoubleClick(TQListViewItem*))); - connect (startRL[i], TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotDoubleClick(TQListViewItem*))); - connect (stopRL[i], TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotDoubleClick(TQListViewItem*))); + connect (startRL[i], TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotDoubleClick(TQListViewItem*))); + connect (stopRL[i], TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotDoubleClick(TQListViewItem*))); + connect (startRL[i], TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotDoubleClick(TQListViewItem*))); + connect (stopRL[i], TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotDoubleClick(TQListViewItem*))); // context menus - connect (startRL[i], TQT_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT (popupRunlevelMenu (TDEListView*, TQListViewItem*, const TQPoint&))); - connect (stopRL[i], TQT_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT (popupRunlevelMenu (TDEListView*, TQListViewItem*, const TQPoint&))); + connect (startRL[i], TQ_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT (popupRunlevelMenu (TDEListView*, TQListViewItem*, const TQPoint&))); + connect (stopRL[i], TQ_SIGNAL (contextMenu (TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT (popupRunlevelMenu (TDEListView*, TQListViewItem*, const TQPoint&))); // cannot generate sorting number - connect (startRL[i], TQT_SIGNAL(cannotGenerateNumber()), - this, TQT_SLOT(fwdCannotGenerateNumber())); - connect (stopRL[i], TQT_SIGNAL(cannotGenerateNumber()), - this, TQT_SLOT(fwdCannotGenerateNumber())); + connect (startRL[i], TQ_SIGNAL(cannotGenerateNumber()), + this, TQ_SLOT(fwdCannotGenerateNumber())); + connect (stopRL[i], TQ_SIGNAL(cannotGenerateNumber()), + this, TQ_SLOT(fwdCannotGenerateNumber())); // connecting origin things for "Scripts", too - connect (scripts, TQT_SIGNAL(newOrigin()), startRL[i], TQT_SLOT(slotNewOrigin())); - connect (scripts, TQT_SIGNAL(newOrigin()), stopRL[i], TQT_SLOT(slotNewOrigin())); - connect (startRL[i], TQT_SIGNAL(newOrigin()), scripts, TQT_SLOT(slotNewOrigin())); - connect (stopRL[i], TQT_SIGNAL(newOrigin()), scripts, TQT_SLOT(slotNewOrigin())); + connect (scripts, TQ_SIGNAL(newOrigin()), startRL[i], TQ_SLOT(slotNewOrigin())); + connect (scripts, TQ_SIGNAL(newOrigin()), stopRL[i], TQ_SLOT(slotNewOrigin())); + connect (startRL[i], TQ_SIGNAL(newOrigin()), scripts, TQ_SLOT(slotNewOrigin())); + connect (stopRL[i], TQ_SIGNAL(newOrigin()), scripts, TQ_SLOT(slotNewOrigin())); // use this loop for setting tooltips startRL[i]->setToolTip (i18n("Drag here to start services\n" \ @@ -359,11 +359,11 @@ void KSVContent::initLList() { if (i != j) { - connect (startRL[i], TQT_SIGNAL (newOrigin()), startRL[j], TQT_SLOT (slotNewOrigin())); - connect (stopRL[i], TQT_SIGNAL (newOrigin()), stopRL[j], TQT_SLOT (slotNewOrigin())); + connect (startRL[i], TQ_SIGNAL (newOrigin()), startRL[j], TQ_SLOT (slotNewOrigin())); + connect (stopRL[i], TQ_SIGNAL (newOrigin()), stopRL[j], TQ_SLOT (slotNewOrigin())); - connect (startRL[i], TQT_SIGNAL(newOrigin()), stopRL[j], TQT_SLOT(slotNewOrigin())); - connect (stopRL[i], TQT_SIGNAL(newOrigin()), startRL[j], TQT_SLOT(slotNewOrigin())); + connect (startRL[i], TQ_SIGNAL(newOrigin()), stopRL[j], TQ_SLOT(slotNewOrigin())); + connect (stopRL[i], TQ_SIGNAL(newOrigin()), startRL[j], TQ_SLOT(slotNewOrigin())); } } } @@ -574,14 +574,14 @@ void KSVContent::infoOnData (KSVItem* item) KSVData newState = oldState; KSVEntryPropertiesDialog* props = new KSVEntryPropertiesDialog (newState, kapp->mainWidget()); - connect (props, TQT_SIGNAL (editService (const TQString&)), - this, TQT_SLOT (editService (const TQString&))); - connect (props, TQT_SIGNAL (startService (const TQString&)), - this, TQT_SLOT (startService (const TQString&))); - connect (props, TQT_SIGNAL (stopService (const TQString&)), - this, TQT_SLOT (stopService (const TQString&))); - connect (props, TQT_SIGNAL (restartService (const TQString&)), - this, TQT_SLOT (restartService (const TQString&))); + connect (props, TQ_SIGNAL (editService (const TQString&)), + this, TQ_SLOT (editService (const TQString&))); + connect (props, TQ_SIGNAL (startService (const TQString&)), + this, TQ_SLOT (startService (const TQString&))); + connect (props, TQ_SIGNAL (stopService (const TQString&)), + this, TQ_SLOT (stopService (const TQString&))); + connect (props, TQ_SIGNAL (restartService (const TQString&)), + this, TQ_SLOT (restartService (const TQString&))); int res = props->exec(); @@ -608,9 +608,9 @@ void KSVContent::stopService (const TQString& path) *_proc << path << "stop"; - connect(_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitedProcess(TDEProcess*))); - connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); - connect(_proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotExitedProcess(TDEProcess*))); + connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(_proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); // refresh textDisplay appendLog(i18n("** <stop>Stopping</stop> <cmd>%1</cmd> **<br/>").arg(path), @@ -634,9 +634,9 @@ void KSVContent::startService (const TQString& path) *_proc << path << "start"; - connect(_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitedProcess(TDEProcess*))); - connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); - connect(_proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotExitedProcess(TDEProcess*))); + connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(_proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); // refresh textDisplay appendLog(i18n("** <start>Starting</start> <cmd>%1</cmd> **<br/>").arg(path), @@ -674,9 +674,9 @@ void KSVContent::restartService (const TQString& path) *_proc << path << "restart"; - connect(_proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitDuringRestart(TDEProcess*))); - connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); - connect(_proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotExitDuringRestart(TDEProcess*))); + connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(_proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); // refresh textDisplay appendLog(i18n("** Re-starting <cmd>%1</cmd> **</br>").arg(path), @@ -716,14 +716,14 @@ void KSVContent::slotScriptProperties(TQListViewItem* item) KSVServicePropertiesDialog* prop = new KSVServicePropertiesDialog (*static_cast<KSVItem*> (item)->data(), kapp->mainWidget()); - connect (prop, TQT_SIGNAL (editService (const TQString&)), - this, TQT_SLOT (editService (const TQString&))); - connect (prop, TQT_SIGNAL (startService (const TQString&)), - this, TQT_SLOT (startService (const TQString&))); - connect (prop, TQT_SIGNAL (stopService (const TQString&)), - this, TQT_SLOT (stopService (const TQString&))); - connect (prop, TQT_SIGNAL (restartService (const TQString&)), - this, TQT_SLOT (restartService (const TQString&))); + connect (prop, TQ_SIGNAL (editService (const TQString&)), + this, TQ_SLOT (editService (const TQString&))); + connect (prop, TQ_SIGNAL (startService (const TQString&)), + this, TQ_SLOT (startService (const TQString&))); + connect (prop, TQ_SIGNAL (stopService (const TQString&)), + this, TQ_SLOT (stopService (const TQString&))); + connect (prop, TQ_SIGNAL (restartService (const TQString&)), + this, TQ_SLOT (restartService (const TQString&))); prop->exec(); @@ -737,9 +737,9 @@ void KSVContent::slotExitDuringRestart( TDEProcess* proc ) // signals connected that screw up our output proc->clearArguments(); - connect(proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotExitedProcess(TDEProcess*))); - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotExitedProcess(TDEProcess*))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotOutputOrError(TDEProcess*, char*, int))); proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } @@ -1026,7 +1026,7 @@ void KSVContent::popupServicesMenu (TDEListView*, TQListViewItem* i, const TQPoi if (i >= 1) mOpenWithMenu->insertSeparator(); - mOpenWithMenu->insertItem (i18n ("&Other..."), this, TQT_SLOT (openWith())); + mOpenWithMenu->insertItem (i18n ("&Other..."), this, TQ_SLOT (openWith())); mScriptMenu->exec (p, 1); } diff --git a/ksysv/OldView.h b/ksysv/OldView.h index 53eeb7a..617eb88 100644 --- a/ksysv/OldView.h +++ b/ksysv/OldView.h @@ -46,7 +46,7 @@ class KSVTopLevel; class KSVContent : public TQSplitter { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/PreferencesDialog.cpp b/ksysv/PreferencesDialog.cpp index 8189924..c830a34 100644 --- a/ksysv/PreferencesDialog.cpp +++ b/ksysv/PreferencesDialog.cpp @@ -40,7 +40,7 @@ KSVPreferences::KSVPreferences (TQWidget* parent) */ TQFrame* lafPage = addPage (i18n ("Look & Feel"), TQString(), DesktopIcon ("colorize", 32)); mLookAndFeel = new KSVLookAndFeel (lafPage); - connect( mLookAndFeel, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mLookAndFeel, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); TQVBoxLayout* lafLayout = new TQVBoxLayout (lafPage); lafLayout->addWidget (mLookAndFeel); @@ -68,7 +68,7 @@ KSVPreferences::KSVPreferences (TQWidget* parent) */ TQFrame* pathPage = addPage (i18n ("Paths"), TQString(), DesktopIcon ("kfm", 32)); mPathConfig = new KSVPathConfig(pathPage); - connect( mPathConfig, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mPathConfig, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); TQVBoxLayout *pathLayout = new TQVBoxLayout (pathPage); pathLayout->addWidget (mPathConfig); @@ -79,12 +79,12 @@ KSVPreferences::KSVPreferences (TQWidget* parent) TQFrame* miscPage = addPage (i18n ("Miscellaneous"), i18n("Settings Not Fitting Anywhere Else"), DesktopIcon ("misc", 32)); mMiscConfig = new KSVMiscConfig(miscPage); - connect( mMiscConfig, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mMiscConfig, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); TQVBoxLayout *miscLayout = new TQVBoxLayout (miscPage); miscLayout->addWidget (mMiscConfig); - connect (mMiscConfig->mShowAll, TQT_SIGNAL (clicked()), this, TQT_SLOT (showAllMessages())); + connect (mMiscConfig->mShowAll, TQ_SIGNAL (clicked()), this, TQ_SLOT (showAllMessages())); reReadConfig(); enableButton( Apply, false ); diff --git a/ksysv/PreferencesDialog.h b/ksysv/PreferencesDialog.h index 40b27c3..62660fd 100644 --- a/ksysv/PreferencesDialog.h +++ b/ksysv/PreferencesDialog.h @@ -16,7 +16,7 @@ class KSVConfig; class KSVPreferences : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/Properties.cpp b/ksysv/Properties.cpp index 6b7b378..dd5fccd 100644 --- a/ksysv/Properties.cpp +++ b/ksysv/Properties.cpp @@ -54,21 +54,21 @@ KSVServicesPage::KSVServicesPage (KSVData& data, KPropertiesDialog* props) ksv::getServiceDescription (data.filename(), text); mDesc = new TQTextView (TQString("<p>%1</p>").arg (text), TQString(), desc); - TQButtonGroup* buttons = new TQButtonGroup (1,Qt::Vertical, i18n ("Actions"), mPage); + TQButtonGroup* buttons = new TQButtonGroup (1,TQt::Vertical, i18n ("Actions"), mPage); TQPushButton* b = new TQPushButton (i18n ("&Edit"), buttons); - connect (b, TQT_SIGNAL (clicked()), props, TQT_SLOT (doEdit())); + connect (b, TQ_SIGNAL (clicked()), props, TQ_SLOT (doEdit())); TQFrame* spacer = new TQFrame (buttons); spacer->setMinimumWidth (KDialog::spacingHint()); b = new TQPushButton (i18n ("&Start"), buttons); - connect (b, TQT_SIGNAL (clicked()), props, TQT_SLOT (doStart())); + connect (b, TQ_SIGNAL (clicked()), props, TQ_SLOT (doStart())); b = new TQPushButton (i18n ("S&top"), buttons); - connect (b, TQT_SIGNAL (clicked()), props, TQT_SLOT (doStop())); + connect (b, TQ_SIGNAL (clicked()), props, TQ_SLOT (doStop())); b = new TQPushButton (i18n ("&Restart"), buttons); - connect (b, TQT_SIGNAL (clicked()), props, TQT_SLOT (doRestart())); + connect (b, TQ_SIGNAL (clicked()), props, TQ_SLOT (doRestart())); } KSVServicesPage::~KSVServicesPage () @@ -150,12 +150,12 @@ KSVEntryPage::KSVEntryPage (KSVData& data, KPropertiesDialog* props) top->addWidget (mNumberEdit, 2, 1); top->addWidget (iconLabel, 3, 0); - connect (mServiceEdit, TQT_SIGNAL (textChanged (const TQString&)), - this, TQT_SLOT (emitChanged())); - connect (mLabelEdit, TQT_SIGNAL (textChanged (const TQString&)), - this, TQT_SLOT (emitChanged())); - connect (mNumberEdit, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (emitChanged())); + connect (mServiceEdit, TQ_SIGNAL (textChanged (const TQString&)), + this, TQ_SLOT (emitChanged())); + connect (mLabelEdit, TQ_SIGNAL (textChanged (const TQString&)), + this, TQ_SLOT (emitChanged())); + connect (mNumberEdit, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (emitChanged())); } KSVEntryPage::~KSVEntryPage () diff --git a/ksysv/Properties.h b/ksysv/Properties.h index 9816478..d7df744 100644 --- a/ksysv/Properties.h +++ b/ksysv/Properties.h @@ -16,7 +16,7 @@ class KSVData; class KSVServicePropertiesDialog : public KPropertiesDialog { - Q_OBJECT + TQ_OBJECT public: @@ -42,7 +42,7 @@ private: class KSVEntryPropertiesDialog : public KPropertiesDialog { - Q_OBJECT + TQ_OBJECT public: @@ -67,7 +67,7 @@ private: class KSVEntryPage : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: @@ -93,7 +93,7 @@ private: class KSVServicesPage : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/RunlevelAuthIcon.cpp b/ksysv/RunlevelAuthIcon.cpp index 6199e16..2093464 100644 --- a/ksysv/RunlevelAuthIcon.cpp +++ b/ksysv/RunlevelAuthIcon.cpp @@ -39,7 +39,7 @@ RunlevelAuthIcon::RunlevelAuthIcon (const TQString& servicesPath, const TQString lockBox->setFrameStyle (TQFrame::NoFrame); lockBox->setFixedSize (lockBox->sizeHint()); - connect (mTimer, TQT_SIGNAL (timeout()), this, TQT_SLOT (timerEvent())); + connect (mTimer, TQ_SIGNAL (timeout()), this, TQ_SLOT (timerEvent())); mTimer->start (mInterval); for (int i = 0; i < ksv::runlevelNumber; ++i) diff --git a/ksysv/RunlevelAuthIcon.h b/ksysv/RunlevelAuthIcon.h index 2ecda60..323fef4 100644 --- a/ksysv/RunlevelAuthIcon.h +++ b/ksysv/RunlevelAuthIcon.h @@ -9,7 +9,7 @@ class TQFileInfo; class RunlevelAuthIcon : public KAuthIcon { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY (int refreshInterval READ refreshInterval WRITE setRefreshInterval) diff --git a/ksysv/ServiceDlg.h b/ksysv/ServiceDlg.h index 0b84b19..2c1f622 100644 --- a/ksysv/ServiceDlg.h +++ b/ksysv/ServiceDlg.h @@ -25,7 +25,7 @@ class TQComboBox; class ServiceDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/SpinBox.cpp b/ksysv/SpinBox.cpp index cb56bbe..9e52fd0 100644 --- a/ksysv/SpinBox.cpp +++ b/ksysv/SpinBox.cpp @@ -17,10 +17,10 @@ KSVSpinBox::KSVSpinBox (TQWidget* parent, const char* name) editor()->installEventFilter (this); - connect (editor(), TQT_SIGNAL (textChanged (const TQString&)), - comp, TQT_SLOT (slotMakeCompletion (const TQString&))); - connect (comp, TQT_SIGNAL (match (const TQString&)), - this, TQT_SLOT (handleMatch (const TQString&))); + connect (editor(), TQ_SIGNAL (textChanged (const TQString&)), + comp, TQ_SLOT (slotMakeCompletion (const TQString&))); + connect (comp, TQ_SIGNAL (match (const TQString&)), + this, TQ_SLOT (handleMatch (const TQString&))); } KSVSpinBox::~KSVSpinBox () @@ -67,7 +67,7 @@ bool KSVSpinBox::eventFilter (TQObject* o, TQEvent* e) Q_UNUSED(o); if (e->type() == TQEvent::KeyPress) { - TQKeyEvent* ke = TQT_TQKEYEVENT(e); + TQKeyEvent* ke = static_cast<TQKeyEvent*>(e); switch (ke->key()) { diff --git a/ksysv/SpinBox.h b/ksysv/SpinBox.h index 00369d3..55aae77 100644 --- a/ksysv/SpinBox.h +++ b/ksysv/SpinBox.h @@ -9,7 +9,7 @@ class KSVSpinBox : public TQSpinBox, public TDECompletionBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/TopWidget.cpp b/ksysv/TopWidget.cpp index 2dfa585..88c5c2b 100644 --- a/ksysv/TopWidget.cpp +++ b/ksysv/TopWidget.cpp @@ -113,8 +113,8 @@ KSVTopLevel::KSVTopLevel() mOpenWith (0L), mOpenDefault (0L), - mUndoList (new ActionList (TQT_TQOBJECT(this), "UndoList")), - mRedoList (new ActionList (TQT_TQOBJECT(this), "RedoList")), + mUndoList (new ActionList (this, "UndoList")), + mRedoList (new ActionList (this, "RedoList")), mStartDlg (new ServiceDlg (i18n("Start Service"), i18n("&Choose which service to start:"), this)), @@ -139,27 +139,27 @@ KSVTopLevel::KSVTopLevel() setCentralWidget(mView); // ensure that the statusbar gets updated correctly - connect (mView, TQT_SIGNAL(sigRun(const TQString&)), this, TQT_SLOT(slotUpdateRunning(const TQString&))); - connect (mView, TQT_SIGNAL(sigStop()), statusBar(), TQT_SLOT(clear())); - connect (mView, TQT_SIGNAL(cannotGenerateNumber()), this, TQT_SLOT(catchCannotGenerateNumber())); - connect (mView, TQT_SIGNAL(undoAction(KSVAction*)), this, TQT_SLOT(pushUndoAction(KSVAction*))); - connect (mView, TQT_SIGNAL(logChanged()), this, TQT_SLOT(enableLogActions())); + connect (mView, TQ_SIGNAL(sigRun(const TQString&)), this, TQ_SLOT(slotUpdateRunning(const TQString&))); + connect (mView, TQ_SIGNAL(sigStop()), statusBar(), TQ_SLOT(clear())); + connect (mView, TQ_SIGNAL(cannotGenerateNumber()), this, TQ_SLOT(catchCannotGenerateNumber())); + connect (mView, TQ_SIGNAL(undoAction(KSVAction*)), this, TQ_SLOT(pushUndoAction(KSVAction*))); + connect (mView, TQ_SIGNAL(logChanged()), this, TQ_SLOT(enableLogActions())); // cut & copy - connect (mView, TQT_SIGNAL (newOrigin()), - this, TQT_SLOT (dispatchEdit())); + connect (mView, TQ_SIGNAL (newOrigin()), + this, TQ_SLOT (dispatchEdit())); // undo - connect (mUndoList, TQT_SIGNAL(empty()), this, TQT_SLOT(disableUndo())); - connect (mUndoList, TQT_SIGNAL(filled()), this, TQT_SLOT(enableUndo())); + connect (mUndoList, TQ_SIGNAL(empty()), this, TQ_SLOT(disableUndo())); + connect (mUndoList, TQ_SIGNAL(filled()), this, TQ_SLOT(enableUndo())); // and redo - connect (mRedoList, TQT_SIGNAL(empty()), this, TQT_SLOT(disableRedo())); - connect (mRedoList, TQT_SIGNAL(filled()), this, TQT_SLOT(enableRedo())); + connect (mRedoList, TQ_SIGNAL(empty()), this, TQ_SLOT(disableRedo())); + connect (mRedoList, TQ_SIGNAL(filled()), this, TQ_SLOT(enableRedo())); // paste - connect (kapp->clipboard(), TQT_SIGNAL (dataChanged()), - this, TQT_SLOT (dispatchEdit())); + connect (kapp->clipboard(), TQ_SIGNAL (dataChanged()), + this, TQ_SLOT (dispatchEdit())); // init mView according to saved preferences slotReadConfig(); @@ -186,23 +186,23 @@ KSVTopLevel::~KSVTopLevel() void KSVTopLevel::initTools() { - connect (mStartDlg, TQT_SIGNAL(doAction(const TQString&)), - mView, TQT_SLOT(startService(const TQString&))); - connect (mStopDlg, TQT_SIGNAL(doAction(const TQString&)), - mView, TQT_SLOT(editService(const TQString&))); - connect (mRestartDlg, TQT_SIGNAL(doAction(const TQString&)), - mView, TQT_SLOT(restartService(const TQString&))); - connect (mEditDlg, TQT_SIGNAL(doAction(const TQString&)), - mView, TQT_SLOT(editService(const TQString&))); - - connect (mStartDlg, TQT_SIGNAL (display (bool)), - this, TQT_SLOT (dispatchStartService (bool))); - connect (mStopDlg, TQT_SIGNAL (display (bool)), - this, TQT_SLOT (dispatchStopService (bool))); - connect (mRestartDlg, TQT_SIGNAL (display (bool)), - this, TQT_SLOT (dispatchRestartService (bool))); - connect (mEditDlg, TQT_SIGNAL (display (bool)), - this, TQT_SLOT (dispatchEditService (bool))); + connect (mStartDlg, TQ_SIGNAL(doAction(const TQString&)), + mView, TQ_SLOT(startService(const TQString&))); + connect (mStopDlg, TQ_SIGNAL(doAction(const TQString&)), + mView, TQ_SLOT(editService(const TQString&))); + connect (mRestartDlg, TQ_SIGNAL(doAction(const TQString&)), + mView, TQ_SLOT(restartService(const TQString&))); + connect (mEditDlg, TQ_SIGNAL(doAction(const TQString&)), + mView, TQ_SLOT(editService(const TQString&))); + + connect (mStartDlg, TQ_SIGNAL (display (bool)), + this, TQ_SLOT (dispatchStartService (bool))); + connect (mStopDlg, TQ_SIGNAL (display (bool)), + this, TQ_SLOT (dispatchStopService (bool))); + connect (mRestartDlg, TQ_SIGNAL (display (bool)), + this, TQ_SLOT (dispatchRestartService (bool))); + connect (mEditDlg, TQ_SIGNAL (display (bool)), + this, TQ_SLOT (dispatchEditService (bool))); } @@ -211,48 +211,48 @@ void KSVTopLevel::initActions () TDEActionCollection* coll = actionCollection(); // setup File menu - mFileRevert = KStdAction::revert (TQT_TQOBJECT(this), TQT_SLOT (slotClearChanges()), coll); + mFileRevert = KStdAction::revert (this, TQ_SLOT (slotClearChanges()), coll); mFileRevert->setText (i18n("Re&vert Configuration")); - mFileLoad = KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT (load()), coll); + mFileLoad = KStdAction::open (this, TQ_SLOT (load()), coll); mFileLoad->setText (i18n ("&Open...")); - mFileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotAcceptChanges()), coll); + mFileSave = KStdAction::save(this, TQ_SLOT(slotAcceptChanges()), coll); mFileSave->setText (i18n("&Save Configuration")); - mFileSaveAs = KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT (saveAs ()), coll); + mFileSaveAs = KStdAction::saveAs (this, TQ_SLOT (saveAs ()), coll); - mFileSaveLog = KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT(slotSaveLog()), coll, "ksysv_save_log"); + mFileSaveLog = KStdAction::save (this, TQ_SLOT(slotSaveLog()), coll, "ksysv_save_log"); mFileSaveLog->setText (i18n("Save &Log...")); mFileSaveLog->setShortcut (Key_L+CTRL); mFileSaveLog->setEnabled (false); // disabled due to complexity - // mFilePrint = KStdAction::print (this, TQT_SLOT (print()), coll); + // mFilePrint = KStdAction::print (this, TQ_SLOT (print()), coll); - mFilePrintLog = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printLog()), coll, "ksysv_print_log"); + mFilePrintLog = KStdAction::print(this, TQ_SLOT(printLog()), coll, "ksysv_print_log"); mFilePrintLog->setText( i18n("&Print Log...")); mFilePrintLog->setEnabled (false); - mFileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), coll); + mFileQuit = KStdAction::quit(this, TQ_SLOT(close()), coll); // setup Edit menu - mEditUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(editUndo()), coll); + mEditUndo = KStdAction::undo(this, TQ_SLOT(editUndo()), coll); mEditUndo->setEnabled (false); - mEditRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(editRedo()), coll); + mEditRedo = KStdAction::redo(this, TQ_SLOT(editRedo()), coll); mEditUndo->setEnabled (false); - mEditCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(editCut()), coll); - mEditCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(editCopy()), coll); - mEditPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(editPaste()), coll); - mPasteAppend = KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT (pasteAppend()), + mEditCut = KStdAction::cut(this, TQ_SLOT(editCut()), coll); + mEditCopy = KStdAction::copy(this, TQ_SLOT(editCopy()), coll); + mEditPaste = KStdAction::paste(this, TQ_SLOT(editPaste()), coll); + mPasteAppend = KStdAction::paste (this, TQ_SLOT (pasteAppend()), coll, "ksysv_paste_append"); mEditProperties = new TDEAction (i18n("P&roperties"), 0, - TQT_TQOBJECT(this), TQT_SLOT(properties()), + this, TQ_SLOT(properties()), coll, "ksysv_properties"); mOpenDefault = new TDEAction (i18n ("&Open"), 0, - TQT_TQOBJECT(this), TQT_SLOT (editService()), + this, TQ_SLOT (editService()), coll, "ksysv_open_service"); mOpenWith = new TDEActionMenu (i18n ("Open &With"), coll, "ksysv_open_with"); @@ -260,30 +260,30 @@ void KSVTopLevel::initActions () // setup Settings menu createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings (TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), coll); - KStdAction::configureToolbars (TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()), coll); - KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(saveOptions()), coll); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), coll); + KStdAction::keyBindings (this, TQ_SLOT(configureKeys()), coll); + KStdAction::configureToolbars (this, TQ_SLOT(configureToolbars()), coll); + KStdAction::saveOptions(this, TQ_SLOT(saveOptions()), coll); + KStdAction::preferences(this, TQ_SLOT(slotShowConfig()), coll); mOptionsToggleLog = new TDEToggleAction (i18n("Show &Log"), "toggle_log", 0, - TQT_TQOBJECT(this), TQT_SLOT (toggleLog()), + this, TQ_SLOT (toggleLog()), coll, "ksysv_toggle_log"); mOptionsToggleLog->setCheckedState(i18n("Hide &Log")); // setup Tools menu mToolsStartService = new TDEToggleAction (i18n("&Start Service..."), "ksysv_start", 0, - TQT_TQOBJECT(mStartDlg), TQT_SLOT (toggle()), + mStartDlg, TQ_SLOT (toggle()), coll, "ksysv_start_service"); mToolsStopService = new TDEToggleAction (i18n("&Stop Service..."), "ksysv_stop", 0, - TQT_TQOBJECT(mStopDlg), TQT_SLOT (toggle()), + mStopDlg, TQ_SLOT (toggle()), coll, "ksysv_stop_service"); mToolsRestartService = new TDEToggleAction (i18n("&Restart Service..."), 0, - TQT_TQOBJECT(mRestartDlg), TQT_SLOT (toggle()), + mRestartDlg, TQ_SLOT (toggle()), coll, "ksysv_restart_service"); mToolsEditService = new TDEToggleAction (i18n("&Edit Service..."), 0, - TQT_TQOBJECT(mEditDlg), TQT_SLOT (toggle()), + mEditDlg, TQ_SLOT (toggle()), coll, "ksysv_edit_service"); createGUI(xmlFile()); @@ -393,7 +393,7 @@ void KSVTopLevel::initStatusBar() TQHBox* visBox = new TQHBox (status, "visBox"); TQButtonGroup* group = new TQButtonGroup (this, "visButtonGroup"); group->hide(); - connect (group, TQT_SIGNAL (clicked (int)), this, TQT_SLOT (toggleRunlevel (int))); + connect (group, TQ_SIGNAL (clicked (int)), this, TQ_SLOT (toggleRunlevel (int))); TQWhatsThis::add (visBox, i18n ("<p>Click on the checkboxes to <strong>show</strong> or "\ "<strong>hide</strong> runlevels.</p> " \ @@ -416,8 +416,8 @@ void KSVTopLevel::initStatusBar() TQWidget* strut = new TQWidget (authIconBox, "Strut"); strut->setFixedWidth (KDialog::spacingHint()); mAuth = new RunlevelAuthIcon (mConfig->scriptPath(), mConfig->runlevelPath(), authIconBox); - connect (mAuth, TQT_SIGNAL (authChanged(bool)), mView, TQT_SLOT(multiplexEnabled(bool))); - connect (mAuth, TQT_SIGNAL (authChanged(bool)), this, TQT_SLOT(writingEnabled(bool))); + connect (mAuth, TQ_SIGNAL (authChanged(bool)), mView, TQ_SLOT(multiplexEnabled(bool))); + connect (mAuth, TQ_SIGNAL (authChanged(bool)), this, TQ_SLOT(writingEnabled(bool))); TQWhatsThis::add (authIconBox, i18n ("<p>If the lock is closed <img src=\"user|ksysv_locked\"/>, "\ "you don't have the right " \ @@ -444,17 +444,17 @@ void KSVTopLevel::slotShowConfig() { mPreferences = KSVPreferences::self(); - connect (mPreferences, TQT_SIGNAL (updateColors ()), - this, TQT_SLOT (updateColors ())); + connect (mPreferences, TQ_SIGNAL (updateColors ()), + this, TQ_SLOT (updateColors ())); - connect (mPreferences, TQT_SIGNAL (updateServicesPath ()), - this, TQT_SLOT (updateServicesPath ())); + connect (mPreferences, TQ_SIGNAL (updateServicesPath ()), + this, TQ_SLOT (updateServicesPath ())); - connect (mPreferences, TQT_SIGNAL (updateRunlevelsPath ()), - this, TQT_SLOT (updateRunlevelsPath ())); + connect (mPreferences, TQ_SIGNAL (updateRunlevelsPath ()), + this, TQ_SLOT (updateRunlevelsPath ())); - connect (mPreferences, TQT_SIGNAL (updateFonts ()), - mView, TQT_SLOT (repaintRunlevels ())); + connect (mPreferences, TQ_SIGNAL (updateFonts ()), + mView, TQ_SLOT (repaintRunlevels ())); } // mPreferences->setInitialSize (TQSize (400,300), true); @@ -981,7 +981,7 @@ void KSVTopLevel::configureKeys () void KSVTopLevel::configureToolbars () { KEditToolbar dlg(filteredActions(), xmlFile(), true, this); - connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } diff --git a/ksysv/TopWidget.h b/ksysv/TopWidget.h index 522d535..4fe17e5 100644 --- a/ksysv/TopWidget.h +++ b/ksysv/TopWidget.h @@ -38,7 +38,7 @@ class RunlevelAuthIcon; class KSVTopLevel : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/kscroller.cpp b/ksysv/kscroller.cpp index 0c18b25..58cb254 100644 --- a/ksysv/kscroller.cpp +++ b/ksysv/kscroller.cpp @@ -26,8 +26,8 @@ public: KScroller::KScroller (TQWidget* parent, const char* name) : TQFrame (parent, name), d (new KScrollerPrivate()), - mVertical (new TQScrollBar (Qt::Vertical, this)), - mHorizontal (new TQScrollBar (Qt::Horizontal, this)), + mVertical (new TQScrollBar (TQt::Vertical, this)), + mHorizontal (new TQScrollBar (TQt::Horizontal, this)), mCornerWidget (new TQWidget (this)), mContent (0L), mVerticalOld (0), @@ -37,10 +37,10 @@ KScroller::KScroller (TQWidget* parent, const char* name) mVertical->hide(); mHorizontal->hide(); - connect (mVertical, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (scrollVertical (int))); - connect (mHorizontal, TQT_SIGNAL (valueChanged (int)), - this, TQT_SLOT (scrollHorizontal (int))); + connect (mVertical, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (scrollVertical (int))); + connect (mHorizontal, TQ_SIGNAL (valueChanged (int)), + this, TQ_SLOT (scrollHorizontal (int))); } KScroller::~KScroller () diff --git a/ksysv/kscroller.h b/ksysv/kscroller.h index 0a573c2..bc59b69 100644 --- a/ksysv/kscroller.h +++ b/ksysv/kscroller.h @@ -15,7 +15,7 @@ class TQScrollBar; */ class KScroller : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/ksvapplication.h b/ksysv/ksvapplication.h index 35ce616..5da7ab6 100644 --- a/ksysv/ksvapplication.h +++ b/ksysv/ksvapplication.h @@ -7,7 +7,7 @@ class KSVApplication : public KUniqueApplication { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/ksvconfigwizard.cpp b/ksysv/ksvconfigwizard.cpp index 54450fa..86aaf24 100644 --- a/ksysv/ksvconfigwizard.cpp +++ b/ksysv/ksvconfigwizard.cpp @@ -55,8 +55,8 @@ KSVConfigWizard::KSVConfigWizard (TQWidget* parent, const char* name, bool modal setFinishEnabled (mFinishedPage, true); // some connections - connect (this, TQT_SIGNAL (selected (const TQString&)), - this, TQT_SLOT (selectedPage (const TQString&))); + connect (this, TQ_SIGNAL (selected (const TQString&)), + this, TQ_SLOT (selectedPage (const TQString&))); // hide cancel-button cancelButton()->hide(); diff --git a/ksysv/ksvconfigwizard.h b/ksysv/ksvconfigwizard.h index 7f74840..b37a7cf 100644 --- a/ksysv/ksvconfigwizard.h +++ b/ksysv/ksvconfigwizard.h @@ -31,7 +31,7 @@ class KSVConfigWizard : public ConfigWizard { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/ksvdrag.h b/ksysv/ksvdrag.h index 6e39591..ac2c368 100644 --- a/ksysv/ksvdrag.h +++ b/ksysv/ksvdrag.h @@ -11,7 +11,7 @@ class TQWidget; class KSVDrag : public TQDragObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/ksvdraglist.cpp b/ksysv/ksvdraglist.cpp index 6b3c41f..077bad4 100644 --- a/ksysv/ksvdraglist.cpp +++ b/ksysv/ksvdraglist.cpp @@ -229,7 +229,7 @@ TQPixmap KSVItem::paintDragIcon (const TQFont& font, const TQColorGroup&) const label()); TQBrush brush (color0); - brush.setStyle(Qt::Dense5Pattern); + brush.setStyle(TQt::Dense5Pattern); p.fillRect (0, 0, width, height, brush); p.end(); @@ -358,8 +358,8 @@ KSVDragList::KSVDragList ( TQWidget* parent, const char* name ) mRMList.setAutoDelete(true); // catch drops - connect (this, TQT_SIGNAL (dropped (TQDropEvent*, TQListViewItem*)), - this, TQT_SLOT (drop (TQDropEvent*, TQListViewItem*))); + connect (this, TQ_SIGNAL (dropped (TQDropEvent*, TQListViewItem*)), + this, TQ_SLOT (drop (TQDropEvent*, TQListViewItem*))); } KSVDragList::~KSVDragList() @@ -373,8 +373,8 @@ KSVDragList::~KSVDragList() void KSVDragList::initItem (TQString file, TQString path, TQString name, TQ_INT8 nr) { KSVItem* tmp = new KSVItem(this, file, path, name, nr); - tmp->setRunlevel(TQT_TQOBJECT(this)->name()); - tmp->setOriginalRunlevel(TQT_TQOBJECT(this)->name()); + tmp->setRunlevel(this->name()); + tmp->setOriginalRunlevel(this->name()); tmp->setIcon (mIcon); diff --git a/ksysv/ksvdraglist.h b/ksysv/ksvdraglist.h index 6c75706..842c685 100644 --- a/ksysv/ksvdraglist.h +++ b/ksysv/ksvdraglist.h @@ -151,7 +151,7 @@ private: class KSVDragList : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/ksvlookandfeel.h b/ksysv/ksvlookandfeel.h index 12ea083..fc1e32a 100644 --- a/ksysv/ksvlookandfeel.h +++ b/ksysv/ksvlookandfeel.h @@ -11,7 +11,7 @@ #include <tqfont.h> class KSVLookAndFeel : public LookAndFeel { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/ksvmiscconfig.h b/ksysv/ksvmiscconfig.h index b6a2b4b..a11dbbd 100644 --- a/ksysv/ksvmiscconfig.h +++ b/ksysv/ksvmiscconfig.h @@ -29,7 +29,7 @@ class KSVMiscConfig : public MiscConfiguration { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/ksvpathconfig.h b/ksysv/ksvpathconfig.h index 42973b0..8ae2c34 100644 --- a/ksysv/ksvpathconfig.h +++ b/ksysv/ksvpathconfig.h @@ -29,7 +29,7 @@ class KSVPathConfig : public PathConfiguration { - Q_OBJECT + TQ_OBJECT public: diff --git a/ksysv/lookandfeelconfig.ui b/ksysv/lookandfeelconfig.ui index 5046fc7..0a095e3 100644 --- a/ksysv/lookandfeelconfig.ui +++ b/ksysv/lookandfeelconfig.ui @@ -490,11 +490,11 @@ <includes> <include location="global" impldecl="in declaration">tdelocale.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">chooseNumberFont()</slot> <slot access="protected">chooseServiceFont()</slot> <slot access="protected">slotChanged()</slot> -</Q_SLOTS> +</slots> <pixmapfunction>DesktopIcon</pixmapfunction> <layoutdefaults spacing="6" margin="11"/> <includes> diff --git a/ksysv/main.cpp b/ksysv/main.cpp index f7e4df2..ad7f8bf 100644 --- a/ksysv/main.cpp +++ b/ksysv/main.cpp @@ -53,7 +53,7 @@ static void myMessageOutput( TQtMsgType type, const char *msg ) int main( int argc, char **argv ) { // install own message handler that ignores debug-msg when DEBUG is not defined - tqInstallMsgHandler(myMessageOutput); + qInstallMsgHandler(myMessageOutput); TDEAboutData about("ksysv", I18N_NOOP("SysV-Init Editor"), KSYSV_VERSION_STRING, I18N_NOOP ("Editor for Sys-V like init configurations"), diff --git a/ksysv/miscconfig.ui b/ksysv/miscconfig.ui index 3ee6b0f..fee98a5 100644 --- a/ksysv/miscconfig.ui +++ b/ksysv/miscconfig.ui @@ -179,8 +179,8 @@ <includes> <include location="global" impldecl="in declaration">tdelocale.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">slotChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksysv/pathconfig.ui b/ksysv/pathconfig.ui index 0273f2b..10d2cd0 100644 --- a/ksysv/pathconfig.ui +++ b/ksysv/pathconfig.ui @@ -278,20 +278,14 @@ <tabstop>mBrowseRunlevel</tabstop> </tabstops> <includes> - <include location="global" impldecl="in declaration">tdelocale.h</include> <include location="global" impldecl="in declaration">kdialog.h</include> + <include location="global" impldecl="in declaration">tdelocale.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected">browseServices()</slot> <slot access="protected">browseRunlevels()</slot> <slot access="protected">slotChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> -<includes> - <include location="global" impldecl="in implementation">klineedit.h</include> -</includes> </UI> diff --git a/ksysv/trash.h b/ksysv/trash.h index d848790..da6423a 100644 --- a/ksysv/trash.h +++ b/ksysv/trash.h @@ -27,7 +27,7 @@ class KSVAction; class KSVTrash : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuser/addUser.cpp b/kuser/addUser.cpp index 06f716a..ed154d5 100644 --- a/kuser/addUser.cpp +++ b/kuser/addUser.cpp @@ -49,7 +49,7 @@ addUser::addUser( KU::KUser *AUser, bool useprivategroup, createhome = new TQCheckBox(i18n("Create home folder"), group); createhome->setChecked(true); copyskel = new TQCheckBox(i18n("Copy skeleton"), group); - connect(createhome, TQT_SIGNAL(toggled(bool)), copyskel, TQT_SLOT(setEnabled(bool))); + connect(createhome, TQ_SIGNAL(toggled(bool)), copyskel, TQ_SLOT(setEnabled(bool))); frontlayout->addMultiCellWidget(group, frontrow, frontrow, 0, 2); if ( useprivategroup ) pbprigr->setEnabled( false ); diff --git a/kuser/addUser.h b/kuser/addUser.h index 222e016..181d598 100644 --- a/kuser/addUser.h +++ b/kuser/addUser.h @@ -25,7 +25,7 @@ #include "propdlg.h" class addUser: public propdlg { - Q_OBJECT + TQ_OBJECT public: addUser(KU::KUser *AUser, bool useprivategroup, diff --git a/kuser/delUser.h b/kuser/delUser.h index be0fd50..37f2ded 100644 --- a/kuser/delUser.h +++ b/kuser/delUser.h @@ -26,7 +26,7 @@ #include "kuser.h" class delUser: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: delUser(KU::KUser *AUser, TQWidget *parent = 0, const char *name = 0); diff --git a/kuser/editDefaults.cpp b/kuser/editDefaults.cpp index b030c2b..37e2a63 100644 --- a/kuser/editDefaults.cpp +++ b/kuser/editDefaults.cpp @@ -76,7 +76,7 @@ editDefaults::editDefaults( TDEConfigSkeleton *config, TQWidget *parent, const c page3->addTab( page3b, i18n("Settings") ); page3c = new LdapSamba( this ); - connect( page3c->domQuery, TQT_SIGNAL(clicked()), TQT_SLOT(slotQueryClicked()) ); + connect( page3c->domQuery, TQ_SIGNAL(clicked()), TQ_SLOT(slotQueryClicked()) ); page3->addTab( page3c, i18n("Samba") ); addPage( page3, i18n("LDAP"), "", i18n("LDAP Source Settings") ); } @@ -107,10 +107,10 @@ void editDefaults::slotQueryClicked() mLdif.startParsing(); TDEIO::Job *job = TDEIO::get( _url, true, false ); // job->addMetaData("no-auth-prompt","true"); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( loadResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( loadResult( TDEIO::Job* ) ) ); mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true ); mProg->progressBar()->setValue( 0 ); diff --git a/kuser/editDefaults.h b/kuser/editDefaults.h index 55e77c8..95c4c54 100644 --- a/kuser/editDefaults.h +++ b/kuser/editDefaults.h @@ -38,7 +38,7 @@ struct SambaDomain { }; class editDefaults : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: editDefaults( TDEConfigSkeleton *config, TQWidget* parent, const char * name = 0 ); diff --git a/kuser/editGroup.cpp b/kuser/editGroup.cpp index c9ca5a3..c5de11e 100644 --- a/kuser/editGroup.cpp +++ b/kuser/editGroup.cpp @@ -60,7 +60,7 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add, // ensure it fits at least 20 characters legid->setText( "XXXXXXXXXXXXXXXXXXX" ); legid->setText( TQString::number(kg->getGID()) ); - legid->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) ); + legid->setValidator( new TQIntValidator(this) ); legid->setEnabled( mAdd ); legid->setReadOnly( ro ); lb->setBuddy( legid ); @@ -78,9 +78,9 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add, } lerid->setCurrentText( TQString::number( sid.getRID() ) ); - lerid->setValidator (new TQIntValidator(TQT_TQOBJECT(this)) ); + lerid->setValidator (new TQIntValidator(this) ); lerid->setEnabled( mAdd ); - connect( lerid, TQT_SIGNAL(activated(int)), TQT_SLOT(ridSelected(int)) ); + connect( lerid, TQ_SIGNAL(activated(int)), TQ_SLOT(ridSelected(int)) ); lb->setBuddy( lerid ); layout->addWidget( lb, 1, 0 ); layout->addMultiCellWidget( lerid, 1, 1, 1, 2 ); @@ -150,11 +150,11 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add, cbsamba = new TQCheckBox( i18n("Disable Samba group information"), page ); layout->addMultiCellWidget( cbsamba, 7, 7, 0, 2 ); - connect( cbsamba, TQT_SIGNAL(toggled(bool)), ledesc, TQT_SLOT(setDisabled(bool)) ); - connect( cbsamba, TQT_SIGNAL(toggled(bool)), ledispname, TQT_SLOT(setDisabled(bool)) ); - connect( cbsamba, TQT_SIGNAL(toggled(bool)), letype, TQT_SLOT(setDisabled(bool)) ); - connect( cbsamba, TQT_SIGNAL(toggled(bool)), ledomsid, TQT_SLOT(setDisabled(bool)) ); - if ( mAdd ) connect( cbsamba, TQT_SIGNAL(toggled(bool)), lerid, TQT_SLOT(setDisabled(bool)) ); + connect( cbsamba, TQ_SIGNAL(toggled(bool)), ledesc, TQ_SLOT(setDisabled(bool)) ); + connect( cbsamba, TQ_SIGNAL(toggled(bool)), ledispname, TQ_SLOT(setDisabled(bool)) ); + connect( cbsamba, TQ_SIGNAL(toggled(bool)), letype, TQ_SLOT(setDisabled(bool)) ); + connect( cbsamba, TQ_SIGNAL(toggled(bool)), ledomsid, TQ_SLOT(setDisabled(bool)) ); + if ( mAdd ) connect( cbsamba, TQ_SIGNAL(toggled(bool)), lerid, TQ_SLOT(setDisabled(bool)) ); if ( !mAdd ) cbsamba->setChecked( !( kg->getCaps() & KU::KGroup::Cap_Samba ) ); } @@ -176,8 +176,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add, layout->addWidget( m_list_notin, 8, 2 ); // TQString whatstr = i18n("Select the users that should be in this kg->"); // TQWhatsThis::add(m_list, whatstr); -// connect(this,TQT_SIGNAL(okClicked(void)), - //this,TQT_SLOT(okClicked())); +// connect(this,TQ_SIGNAL(okClicked(void)), + //this,TQ_SLOT(okClicked())); for (unsigned int i = 0; i<kug->getUsers().count(); i++) { @@ -192,8 +192,8 @@ editGroup::editGroup(KU::KGroup *akg, bool samba, bool add, } } - connect(btadd, TQT_SIGNAL(clicked()), TQT_SLOT(addClicked())); - connect(btdel, TQT_SIGNAL(clicked()), TQT_SLOT(delClicked())); + connect(btadd, TQ_SIGNAL(clicked()), TQ_SLOT(addClicked())); + connect(btdel, TQ_SIGNAL(clicked()), TQ_SLOT(delClicked())); if ( ro ) { btadd->setEnabled( false ); diff --git a/kuser/editGroup.h b/kuser/editGroup.h index 9ac2cda..3a55d8a 100644 --- a/kuser/editGroup.h +++ b/kuser/editGroup.h @@ -32,7 +32,7 @@ class editGroup : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuser/generalsettings.ui b/kuser/generalsettings.ui index f6e4be4..bcf56e5 100644 --- a/kuser/generalsettings.ui +++ b/kuser/generalsettings.ui @@ -233,9 +233,9 @@ <tabstop>kcfg_copySkel</tabstop> <tabstop>kcfg_userPrivateGroup</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>kcfg_createHomeDir_toggled( bool )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/kuser/kgroupldap.cpp b/kuser/kgroupldap.cpp index c969e19..977cb06 100644 --- a/kuser/kgroupldap.cpp +++ b/kuser/kgroupldap.cpp @@ -170,10 +170,10 @@ bool KGroupLDAP::reload() ldif = ""; TDEIO::Job *job = TDEIO::get( mUrl, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( result( TDEIO::Job* ) ) ); mProg->exec(); if ( mCancel ) job->kill(); @@ -193,10 +193,10 @@ bool KGroupLDAP::dbcommit() mProg = new KProgressDialog( 0, "", i18n("LDAP Operation"), "", true ); TDEIO::Job *job = TDEIO::put( mUrl, -1, false, false, false ); - connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQ_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( result( TDEIO::Job* ) ) ); mProg->exec(); return( mOk ); } diff --git a/kuser/kgroupldap.h b/kuser/kgroupldap.h index 910a8d4..5972193 100644 --- a/kuser/kgroupldap.h +++ b/kuser/kgroupldap.h @@ -33,7 +33,7 @@ #include "kgroup.h" class KGroupLDAP : public TQObject, public KU::KGroups { -Q_OBJECT +TQ_OBJECT public: KGroupLDAP( KUserPrefsBase *cfg ); diff --git a/kuser/kgroupvw.h b/kuser/kgroupvw.h index 4b8ff33..33d5a7e 100644 --- a/kuser/kgroupvw.h +++ b/kuser/kgroupvw.h @@ -41,7 +41,7 @@ private: class KGroupView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuser/kuserldap.cpp b/kuser/kuserldap.cpp index a136b61..5ad7836 100644 --- a/kuser/kuserldap.cpp +++ b/kuser/kuserldap.cpp @@ -248,10 +248,10 @@ bool KUserLDAP::reload() ldif = ""; TDEIO::Job *job = TDEIO::get( mUrl, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( result( TDEIO::Job* ) ) ); // job->addMetaData( "SERVER_CTRL0", "1.2.840.113556.1.4.473 true: uidNumber"); mProg->exec(); if ( mCancel ) job->kill(); @@ -610,10 +610,10 @@ bool KUserLDAP::dbcommit() mProg = new KProgressDialog( 0, "", i18n("LDAP Operation"), "", true ); TDEIO::Job *job = TDEIO::put( mUrl, -1, false, false, false ); - connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQ_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( result( TDEIO::Job* ) ) ); mProg->exec(); return( mOk ); } diff --git a/kuser/kuserldap.h b/kuser/kuserldap.h index d2fa46b..50df74c 100644 --- a/kuser/kuserldap.h +++ b/kuser/kuserldap.h @@ -33,7 +33,7 @@ #include "kuser.h" class KUserLDAP : public TQObject, public KU::KUsers { -Q_OBJECT +TQ_OBJECT public: KUserLDAP(KUserPrefsBase *cfg); diff --git a/kuser/kuservw.h b/kuser/kuservw.h index 78e1072..b5c330c 100644 --- a/kuser/kuservw.h +++ b/kuser/kuservw.h @@ -42,7 +42,7 @@ private: class KUserView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuser/ldapsamba.ui b/kuser/ldapsamba.ui index ed4e248..aea4ecf 100644 --- a/kuser/ldapsamba.ui +++ b/kuser/ldapsamba.ui @@ -355,9 +355,9 @@ <tabstop>kcfg_samdomsid</tabstop> <tabstop>domQuery</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>kcfg_ldapsam_toggled( bool )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kuser/mainView.cpp b/kuser/mainView.cpp index eae6ef8..9533b54 100644 --- a/kuser/mainView.cpp +++ b/kuser/mainView.cpp @@ -52,13 +52,13 @@ void mainView::init() { lbgroups = new KGroupView( this, "lbgroups" ); addTab( lbgroups, i18n("Groups")); - connect(lbusers, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(userSelected())); - connect(lbusers, TQT_SIGNAL(returnPressed(TQListViewItem *)), this, TQT_SLOT(userSelected())); + connect(lbusers, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(userSelected())); + connect(lbusers, TQ_SIGNAL(returnPressed(TQListViewItem *)), this, TQ_SLOT(userSelected())); - connect(lbgroups, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(groupSelected())); - connect(lbgroups, TQT_SIGNAL(returnPressed(TQListViewItem *)), this, TQT_SLOT(groupSelected())); + connect(lbgroups, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(groupSelected())); + connect(lbgroups, TQ_SIGNAL(returnPressed(TQListViewItem *)), this, TQ_SLOT(groupSelected())); - connect(this, TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(slotTabChanged())); + connect(this, TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(slotTabChanged())); } mainView::~mainView() diff --git a/kuser/mainView.h b/kuser/mainView.h index b71e5f4..c4bf047 100644 --- a/kuser/mainView.h +++ b/kuser/mainView.h @@ -33,7 +33,7 @@ #include "kgroupvw.h" class mainView : public TQTabWidget { -Q_OBJECT +TQ_OBJECT public: mainView(TQWidget *parent = 0); diff --git a/kuser/mainWidget.cpp b/kuser/mainWidget.cpp index a306a6d..9e6fa54 100644 --- a/kuser/mainWidget.cpp +++ b/kuser/mainWidget.cpp @@ -68,46 +68,46 @@ bool mainWidget::queryClose() void mainWidget::setupActions() { - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(properties()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(properties()), actionCollection()); #define BarIconC(x) BarIcon(TQString::fromLatin1(x)) - (void) new TDEAction(i18n("&Add..."), TQIconSet(BarIconC("add_user")), 0, TQT_TQOBJECT(md), - TQT_SLOT(useradd()), actionCollection(), "add_user"); + (void) new TDEAction(i18n("&Add..."), TQIconSet(BarIconC("add_user")), 0, md, + TQ_SLOT(useradd()), actionCollection(), "add_user"); - (void) new TDEAction(i18n("&Edit..."), TQIconSet(BarIconC("edit_user")), 0, TQT_TQOBJECT(md), - TQT_SLOT(useredit()), actionCollection(), "edit_user"); + (void) new TDEAction(i18n("&Edit..."), TQIconSet(BarIconC("edit_user")), 0, md, + TQ_SLOT(useredit()), actionCollection(), "edit_user"); - (void) new TDEAction(i18n("&Delete..."), TQIconSet(BarIconC("delete_user")), 0, TQT_TQOBJECT(md), - TQT_SLOT(userdel()), actionCollection(), "delete_user"); + (void) new TDEAction(i18n("&Delete..."), TQIconSet(BarIconC("delete_user")), 0, md, + TQ_SLOT(userdel()), actionCollection(), "delete_user"); (void) new TDEAction(i18n("&Set Password..."), - 0, TQT_TQOBJECT(md), TQT_SLOT(setpwd()), actionCollection(), "set_password_user"); + 0, md, TQ_SLOT(setpwd()), actionCollection(), "set_password_user"); - (void) new TDEAction(i18n("&Add..."), TQIconSet(BarIconC("add_group")), 0, TQT_TQOBJECT(md), - TQT_SLOT(grpadd()), actionCollection(), "add_group"); + (void) new TDEAction(i18n("&Add..."), TQIconSet(BarIconC("add_group")), 0, md, + TQ_SLOT(grpadd()), actionCollection(), "add_group"); - (void) new TDEAction(i18n("&Edit..."), TQIconSet(BarIconC("edit_group")), 0, TQT_TQOBJECT(md), - TQT_SLOT(grpedit()), actionCollection(), "edit_group"); + (void) new TDEAction(i18n("&Edit..."), TQIconSet(BarIconC("edit_group")), 0, md, + TQ_SLOT(grpedit()), actionCollection(), "edit_group"); - (void) new TDEAction(i18n("&Delete"), TQIconSet(BarIconC("delete_group")), 0, TQT_TQOBJECT(md), - TQT_SLOT(grpdel()), actionCollection(), "delete_group"); + (void) new TDEAction(i18n("&Delete"), TQIconSet(BarIconC("delete_group")), 0, md, + TQ_SLOT(grpdel()), actionCollection(), "delete_group"); - (void) new TDEAction(i18n("&Reload"), TQIconSet(BarIconC("reload")), 0, TQT_TQOBJECT(this), - TQT_SLOT(reload()), actionCollection(), "reload"); + (void) new TDEAction(i18n("&Reload"), TQIconSet(BarIconC("reload")), 0, this, + TQ_SLOT(reload()), actionCollection(), "reload"); #undef BarIconC (void) new TDEAction(i18n("&Select Connection..."), - 0, TQT_TQOBJECT(this), - TQT_SLOT(selectconn()), actionCollection(), "select_conn"); + 0, this, + TQ_SLOT(selectconn()), actionCollection(), "select_conn"); mShowSys = new TDEToggleAction(i18n("Show System Users/Groups"), - 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(showSys()), actionCollection(), "show_sys"); + 0, 0, this, + TQ_SLOT(showSys()), actionCollection(), "show_sys"); mShowSys->setCheckedState(i18n("Hide System Users/Groups")); mShowSys->setChecked( kug->kcfg()->showsys() ); } @@ -123,7 +123,7 @@ void mainWidget::showSys() void mainWidget::properties() { editDefaults *eddlg = new editDefaults( kug->kcfg(), this ); - connect(eddlg, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplySettings())); + connect(eddlg, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplySettings())); eddlg->show(); } @@ -147,14 +147,14 @@ void mainWidget::init() actionCollection()->action("delete_user")->setEnabled( rw ); actionCollection()->action("set_password_user")->setEnabled( rw ); if ( rw ) { - connect( md, TQT_SIGNAL(userSelected(bool)), - actionCollection()->action("edit_user"), TQT_SLOT(setEnabled(bool)) ); - connect( md, TQT_SIGNAL(userSelected(bool)), - actionCollection()->action("delete_user"), TQT_SLOT(setEnabled(bool)) ); - connect( md, TQT_SIGNAL(userSelected(bool)), - actionCollection()->action("set_password_user"), TQT_SLOT(setEnabled(bool)) ); + connect( md, TQ_SIGNAL(userSelected(bool)), + actionCollection()->action("edit_user"), TQ_SLOT(setEnabled(bool)) ); + connect( md, TQ_SIGNAL(userSelected(bool)), + actionCollection()->action("delete_user"), TQ_SLOT(setEnabled(bool)) ); + connect( md, TQ_SIGNAL(userSelected(bool)), + actionCollection()->action("set_password_user"), TQ_SLOT(setEnabled(bool)) ); } else { - disconnect( md, TQT_SIGNAL(userSelected(bool)), 0, 0 ); + disconnect( md, TQ_SIGNAL(userSelected(bool)), 0, 0 ); } rw = ! ( kug->getGroups().getCaps() & KU::KGroups::Cap_ReadOnly ); @@ -163,16 +163,16 @@ void mainWidget::init() actionCollection()->action("edit_group")->setEnabled( rw ); actionCollection()->action("delete_group")->setEnabled( rw ); if ( rw ) { - connect( md, TQT_SIGNAL(groupSelected(bool)), - actionCollection()->action("edit_group"), TQT_SLOT(setEnabled(bool)) ); - connect( md, TQT_SIGNAL(groupSelected(bool)), - actionCollection()->action("delete_group"), TQT_SLOT(setEnabled(bool)) ); + connect( md, TQ_SIGNAL(groupSelected(bool)), + actionCollection()->action("edit_group"), TQ_SLOT(setEnabled(bool)) ); + connect( md, TQ_SIGNAL(groupSelected(bool)), + actionCollection()->action("delete_group"), TQ_SLOT(setEnabled(bool)) ); } else { - disconnect( md, TQT_SIGNAL(groupSelected(bool)), 0, 0 ); + disconnect( md, TQ_SIGNAL(groupSelected(bool)), 0, 0 ); } md->reloadUsers(); md->reloadGroups(); - TQTimer::singleShot( 0, TQT_TQOBJECT(md), TQT_SLOT(slotTabChanged()) ); + TQTimer::singleShot( 0, md, TQ_SLOT(slotTabChanged()) ); } void mainWidget::slotApplySettings() @@ -193,8 +193,8 @@ void mainWidget::slotApplyConnection() void mainWidget::selectconn() { sc = new SelectConn( kug->kcfg()->connection(), this, "selectconn" ); - connect( sc, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotApplyConnection()) ); - connect( sc, TQT_SIGNAL(okClicked()), TQT_SLOT(slotApplyConnection()) ); + connect( sc, TQ_SIGNAL(applyClicked()), TQ_SLOT(slotApplyConnection()) ); + connect( sc, TQ_SIGNAL(okClicked()), TQ_SLOT(slotApplyConnection()) ); sc->show(); } diff --git a/kuser/mainWidget.h b/kuser/mainWidget.h index 35d0511..6454e36 100644 --- a/kuser/mainWidget.h +++ b/kuser/mainWidget.h @@ -28,7 +28,7 @@ class mainView; class TDEToggleAction; class mainWidget : public TDEMainWindow { -Q_OBJECT +TQ_OBJECT public: mainWidget(const char *name = 0); diff --git a/kuser/passwordpolicy.ui b/kuser/passwordpolicy.ui index fb4b246..2730bbd 100644 --- a/kuser/passwordpolicy.ui +++ b/kuser/passwordpolicy.ui @@ -232,9 +232,9 @@ <tabstop>kcfg_sinact</tabstop> <tabstop>kcfg_sneverexpire</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>kcfg_sneverexpire_toggled( bool )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kdatetimewidget.h</include> diff --git a/kuser/propdlg.cpp b/kuser/propdlg.cpp index 3e82282..7693d6d 100644 --- a/kuser/propdlg.cpp +++ b/kuser/propdlg.cpp @@ -86,7 +86,7 @@ KIntSpinBox *propdlg::addDaysGroup(TQWidget *parent, TQGridLayout *layout, int r } layout->addWidget( days, row, 2 ); - connect(days, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(days, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); TQCheckBox *nc = new TQCheckBox( i18n("Do not change"), parent ); layout->addWidget( nc, row, 3 ); @@ -117,33 +117,33 @@ void propdlg::initDlg() leid = new KLineEdit(frame); // whatstr = i18n("WHAT IS THIS: User Id"); - leid->setValidator(new TQIntValidator(TQT_TQOBJECT(frame))); + leid->setValidator(new TQIntValidator(frame)); addRow(frame, layout, row++, leid, i18n("&User ID:"), whatstr); - connect(leid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(leid, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); if ( !ro ) { pbsetpwd = new TQPushButton(i18n("Set &Password..."), frame); layout->addWidget(pbsetpwd, 0, 2); - connect(pbsetpwd, TQT_SIGNAL(clicked()), this, TQT_SLOT(setpwd())); + connect(pbsetpwd, TQ_SIGNAL(clicked()), this, TQ_SLOT(setpwd())); } lefname = new KLineEdit(frame); // whatstr = i18n("WHAT IS THIS: Full Name"); addRow(frame, layout, row++, lefname, i18n("Full &name:"), whatstr); - connect(lefname, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(lefname, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); lefname->setFocus(); if ( kug->getUsers().getCaps() & KU::KUsers::Cap_InetOrg ) { lesurname = new KLineEdit(frame); // whatstr = i18n("WHAT IS THIS: Surname"); addRow(frame, layout, row++, lesurname, i18n("Surname:"), whatstr); - connect(lesurname, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(lesurname, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); lemail = new KLineEdit(frame); // whatstr = i18n("WHAT IS THIS: Email"); addRow(frame, layout, row++, lemail, i18n("Email address:"), whatstr); - connect(lemail, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(lemail, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); } leshell = new KComboBox(true, frame); @@ -153,13 +153,13 @@ void propdlg::initDlg() TQStringList shells = readShells(); shells.sort(); leshell->insertStringList(shells); - connect(leshell, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(changed())); - connect(leshell, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(leshell, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(changed())); + connect(leshell, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); // whatstr = i18n("WHAT IS THIS: Login Shell"); addRow(frame, layout, row++, leshell, i18n("&Login shell:"), whatstr); lehome = new KLineEdit(frame); - connect(lehome, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(lehome, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); // whatstr = i18n("WHAT IS THIS: Home Directory"); addRow(frame, layout, row++, lehome, i18n("&Home folder:"), whatstr); @@ -167,48 +167,48 @@ void propdlg::initDlg() // differently than Linux. if ( kug->getUsers().getCaps() & KU::KUsers::Cap_BSD ) { leoffice = new KLineEdit(frame); - connect(leoffice, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(leoffice, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); // whatstr = i18n("WHAT IS THIS: Office"); addRow(frame, layout, row++, leoffice, i18n("&Office:"), whatstr); leophone = new KLineEdit(frame); - connect(leophone, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(leophone, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); // whatstr = i18n("WHAT IS THIS: Office Phone"); addRow(frame, layout, row++, leophone, i18n("Offi&ce Phone:"), whatstr); lehphone = new KLineEdit(frame); - connect(lehphone, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(lehphone, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); // whatstr = i18n("WHAT IS THIS: Home Phone"); addRow(frame, layout, row++, lehphone, i18n("Ho&me Phone:"), whatstr); leclass = new KLineEdit(frame); - connect(leclass, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(leclass, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); // whatstr = i18n("WHAT IS THIS: Login class"); addRow(frame, layout, row++, leclass, i18n("Login class:"), whatstr, true); } else { leoffice1 = new KLineEdit(frame); - connect(leoffice1, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(leoffice1, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); // whatstr = i18n("WHAT IS THIS: Office1"); addRow(frame, layout, row++, leoffice1, i18n("&Office #1:"), whatstr); leoffice2 = new KLineEdit(frame); - connect(leoffice2, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(leoffice2, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); // whatstr = i18n("WHAT IS THIS: Office2"); addRow(frame, layout, row++, leoffice2, i18n("O&ffice #2:"), whatstr); leaddress = new KLineEdit(frame); - connect(leaddress, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(leaddress, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); // whatstr = i18n("WHAT IS THIS: Address"); addRow(frame, layout, row++, leaddress, i18n("&Address:"), whatstr); } cbdisabled = new TQCheckBox(frame); - connect(cbdisabled, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed())); + connect(cbdisabled, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed())); addRow(frame, layout, row++, cbdisabled, i18n("Account &disabled"), whatstr); if ( kug->getUsers().getCaps() & KU::KUsers::Cap_Disable_POSIX ) { cbposix = new TQCheckBox(frame); - connect(cbposix, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed())); - connect(cbposix, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(cbposixChanged())); + connect(cbposix, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed())); + connect(cbposix, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(cbposixChanged())); addRow(frame, layout, row++, cbposix, i18n("Disable &POSIX account information"), whatstr); } else { cbposix = 0; @@ -257,9 +257,9 @@ void propdlg::initDlg() cbexpire = new TQCheckBox( i18n("Never"), frame ); layout->addWidget( cbexpire, row++, 3 ); - connect( lesexpire, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(changed()) ); - connect( cbexpire, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed()) ); - connect( cbexpire, TQT_SIGNAL(toggled(bool)), lesexpire, TQT_SLOT(setDisabled(bool)) ); + connect( lesexpire, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(changed()) ); + connect( cbexpire, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed()) ); + connect( cbexpire, TQ_SIGNAL(toggled(bool)), lesexpire, TQ_SLOT(setDisabled(bool)) ); } // Tab 3: Samba @@ -270,48 +270,48 @@ void propdlg::initDlg() lerid = new KLineEdit(frame); // whatstr = i18n("WHAT IS THIS: Rid"); - lerid->setValidator(new TQIntValidator(TQT_TQOBJECT(frame))); + lerid->setValidator(new TQIntValidator(frame)); addRow(frame, layout, row++, lerid, i18n("RID:"), whatstr); - connect(lerid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(lerid, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); leliscript = new KLineEdit(frame); // whatstr = i18n("WHAT IS THIS: Login script"); addRow(frame, layout, row++, leliscript, i18n("Login script:"), whatstr); - connect(leliscript, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(leliscript, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); leprofile = new KLineEdit(frame); // whatstr = i18n("WHAT IS THIS: Login script"); addRow(frame, layout, row++, leprofile, i18n("Profile path:"), whatstr); - connect(leprofile, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(leprofile, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); lehomedrive = new KLineEdit(frame); // whatstr = i18n("WHAT IS THIS: Login script"); addRow(frame, layout, row++, lehomedrive, i18n("Home drive:"), whatstr); - connect(lehomedrive, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(lehomedrive, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); lehomepath = new KLineEdit(frame); // whatstr = i18n("WHAT IS THIS: Login script"); addRow(frame, layout, row++, lehomepath, i18n("Home path:"), whatstr); - connect(lehomepath, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(lehomepath, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); leworkstations = new KLineEdit(frame); // whatstr = i18n("WHAT IS THIS: Login script"); addRow(frame, layout, row++, leworkstations, i18n("User workstations:"), whatstr); - connect(leworkstations, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(leworkstations, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); ledomain = new KLineEdit(frame); // whatstr = i18n("WHAT IS THIS: Login script"); addRow(frame, layout, row++, ledomain, i18n("Domain name:"), whatstr); - connect(ledomain, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(ledomain, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); ledomsid = new KLineEdit(frame); // whatstr = i18n("WHAT IS THIS: Login script"); addRow(frame, layout, row++, ledomsid, i18n("Domain SID:"), whatstr); - connect(ledomsid, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(ledomsid, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); cbsamba = new TQCheckBox(frame); - connect(cbsamba, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed())); - connect(cbsamba, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(cbsambaChanged())); + connect(cbsamba, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed())); + connect(cbsamba, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(cbsambaChanged())); addRow(frame, layout, row++, cbsamba, i18n("Disable &Samba account information"), whatstr); } @@ -332,9 +332,9 @@ void propdlg::initDlg() if ( !ro ) { pbprigr = new TQPushButton( i18n("Set as Primary"), frame ); layout->addWidget( pbprigr, 1, 1 ); - connect( pbprigr, TQT_SIGNAL(clicked()), this, TQT_SLOT(setpgroup()) ); + connect( pbprigr, TQ_SIGNAL(clicked()), this, TQ_SLOT(setpgroup()) ); } - connect( lstgrp, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(gchanged()) ); + connect( lstgrp, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(gchanged()) ); } } diff --git a/kuser/propdlg.h b/kuser/propdlg.h index c7c1fae..2ee6f25 100644 --- a/kuser/propdlg.h +++ b/kuser/propdlg.h @@ -41,7 +41,7 @@ class propdlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuser/pwddlg.cpp b/kuser/pwddlg.cpp index 0989afc..2fda099 100644 --- a/kuser/pwddlg.cpp +++ b/kuser/pwddlg.cpp @@ -28,7 +28,7 @@ pwddlg::pwddlg( TQWidget* parent, const char* name ) : KDialogBase(parent, name, true, i18n("Enter Password"), Ok | Cancel, Ok, true) { - TQGrid *page = makeGridMainWidget(2, Qt::Horizontal); + TQGrid *page = makeGridMainWidget(2, TQt::Horizontal); TQLabel* lb1 = new TQLabel(page, "lb1"); lb1->setText(i18n("Password:")); diff --git a/kuser/pwddlg.h b/kuser/pwddlg.h index d4c56de..5ad4acb 100644 --- a/kuser/pwddlg.h +++ b/kuser/pwddlg.h @@ -26,7 +26,7 @@ #include <kdialogbase.h> class pwddlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kuser/selectconn.cpp b/kuser/selectconn.cpp index 30066f0..9ab2911 100644 --- a/kuser/selectconn.cpp +++ b/kuser/selectconn.cpp @@ -88,7 +88,7 @@ void SelectConn::slotUser3() KUserPrefsBase kcfg( kapp->sharedConfig(), newconn ); editDefaults eddlg( &kcfg, this ); - connect(&eddlg, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotNewApplySettings())); + connect(&eddlg, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotNewApplySettings())); eddlg.exec(); if ( newconn.isEmpty() ) @@ -111,7 +111,7 @@ void SelectConn::slotUser2() kcfg.readConfig(); editDefaults eddlg( &kcfg, this ); - connect( &eddlg, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplySettings()) ); + connect( &eddlg, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplySettings()) ); eddlg.exec(); } diff --git a/kuser/selectconn.h b/kuser/selectconn.h index b9ca1e5..16e705f 100644 --- a/kuser/selectconn.h +++ b/kuser/selectconn.h @@ -23,7 +23,7 @@ #include <kcombobox.h> class SelectConn : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: SelectConn( const TQString &selected, TQWidget* parent, const char * name); diff --git a/lilo-config/README b/lilo-config/README index db83406..464c0ef 100644 --- a/lilo-config/README +++ b/lilo-config/README @@ -3,7 +3,7 @@ used Linux boot loader. Parts of the code (basically all the code that does the real work) are designed to be UI independent (if I ever have the time, there will be a textmode -frontend), which is why I'm using "String"s rather than "QString"s throughout +frontend), which is why I'm using "String"s rather than "TQString"s throughout the code. Please don't change this. Send comments/suggestions to kde-devel@kde.org. diff --git a/lilo-config/kde-qt-common/EditWidget.cpp b/lilo-config/kde-qt-common/EditWidget.cpp index 3b096cd..173aeea 100644 --- a/lilo-config/kde-qt-common/EditWidget.cpp +++ b/lilo-config/kde-qt-common/EditWidget.cpp @@ -36,12 +36,12 @@ EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, T setStretchFactor(lbl, 0); line=new TQLineEdit(text, this); setStretchFactor(line, 1); - connect(line, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(textChanged(const TQString &))); - connect(line, TQT_SIGNAL(returnPressed()), TQT_SIGNAL(returnPressed())); + connect(line, TQ_SIGNAL(textChanged(const TQString &)), TQ_SIGNAL(textChanged(const TQString &))); + connect(line, TQ_SIGNAL(returnPressed()), TQ_SIGNAL(returnPressed())); lbl->setBuddy(line); if(isFile) { select=new TQPushButton(_("Select..."), this); - connect(select, TQT_SIGNAL(clicked()), TQT_SLOT(selectFileClicked())); + connect(select, TQ_SIGNAL(clicked()), TQ_SLOT(selectFileClicked())); select->resize(select->minimumSizeHint()); setStretchFactor(select, 0); } else diff --git a/lilo-config/kde-qt-common/EditWidget.h b/lilo-config/kde-qt-common/EditWidget.h index 411c907..800a59a 100644 --- a/lilo-config/kde-qt-common/EditWidget.h +++ b/lilo-config/kde-qt-common/EditWidget.h @@ -34,7 +34,7 @@ #include <tqpushbutton.h> class EditWidget:public TQHBox { - Q_OBJECT + TQ_OBJECT public: EditWidget(TQString const label="", TQString const text="", bool isFile=false, TQWidget *parent=0, const char *name=0, WFlags f=0, bool allowLines=true); @@ -60,8 +60,8 @@ public: void paste() { line->paste(); }; void setAlignment(int flag) { line->setAlignment(flag); }; int alignment() const { return line->alignment(); }; - void cursorLeft(bool mark, int steps=1) { line->cursorLeft(mark, steps); }; - void cursorRight(bool mark, int steps=1) { line->cursorRight(mark, steps); }; + void cursorLeft(bool mark, int steps=1) { line->cursorBackward(mark, steps); }; + void cursorRight(bool mark, int steps=1) { line->cursorForward(mark, steps); }; void cursorWordForward(bool mark) { line->cursorWordForward(mark); }; void cursorWordBackward(bool mark) { line->cursorWordBackward(mark); }; void backspace() { line->backspace(); }; @@ -70,8 +70,8 @@ public: void end(bool mark) { line->end(mark); }; void setEdited(bool e) { line->setEdited(e); }; bool edited() const { return line->edited(); }; - bool hasMarkedText() const { return line->hasMarkedText(); }; - TQString markedText() const { return line->markedText(); }; + bool hasMarkedText() const { return line->hasSelectedText(); }; + TQString markedText() const { return line->selectedText(); }; virtual TQSize sizeHint() const; virtual TQSize minimumSizeHint() const; public slots: diff --git a/lilo-config/kde-qt-common/expert.cpp b/lilo-config/kde-qt-common/expert.cpp index 5793058..390b3da 100644 --- a/lilo-config/kde-qt-common/expert.cpp +++ b/lilo-config/kde-qt-common/expert.cpp @@ -37,7 +37,7 @@ Expert::Expert(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, layout=new TQHBoxLayout(this); edit=new TQMultiLineEdit(this); layout->addWidget(edit); - connect(edit, TQT_SIGNAL(textChanged()), TQT_SIGNAL(configChanged())); + connect(edit, TQ_SIGNAL(textChanged()), TQ_SIGNAL(configChanged())); TQWhatsThis::add(edit, _("You can edit the lilo.conf file directly here. All changes you make here are automatically transferred to the graphical interface.")); update(); } diff --git a/lilo-config/kde-qt-common/expert.h b/lilo-config/kde-qt-common/expert.h index 7bf82c0..7316690 100644 --- a/lilo-config/kde-qt-common/expert.h +++ b/lilo-config/kde-qt-common/expert.h @@ -34,7 +34,7 @@ #include <tqlayout.h> class Expert:public TQWidget { - Q_OBJECT + TQ_OBJECT public: Expert(liloconf *l=0, TQWidget *parent=0, const char *name=0); diff --git a/lilo-config/kde-qt-common/general.cpp b/lilo-config/kde-qt-common/general.cpp index 2040025..efaaf74 100644 --- a/lilo-config/kde-qt-common/general.cpp +++ b/lilo-config/kde-qt-common/general.cpp @@ -50,7 +50,7 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren p.sort(); for(StringList::const_iterator it=p.begin(); it!=p.end(); it++) drive->insertItem((*it).cstr()); - connect(drive, TQT_SIGNAL(activated(int)), TQT_SIGNAL(configChanged())); + connect(drive, TQ_SIGNAL(activated(int)), TQ_SIGNAL(configChanged())); layout->addWidget(drv); TQWhatsThis::add(drv, _("Select the drive or partition you want to install the LILO boot loader to here. Unless you intend to use other boot managers in addition to LILO, this should be the MBR (master boot record) of your boot drive.<br>In this case, you should probably select <i>/dev/hda</i> if your boot drive is an IDE drive or <i>/dev/sda</i> if your boot drive is SCSI.")); @@ -58,38 +58,38 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren TQLabel *to_lbl=new TQLabel(_("Boot the default kernel/OS &after:"), to); timeout=new TQSpinBox(0, 1000000, 1, to); timeout->setSuffix(_("/10 seconds")); - connect(timeout, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(configChanged())); + connect(timeout, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(configChanged())); to_lbl->setBuddy(timeout); layout->addWidget(to); TQWhatsThis::add(to, _("LILO will wait the amount of time specified here before booting the kernel (or OS) marked as <i>default</i> in the <b>Images</b> tab.")); TQHBox *modes=new TQHBox(this); linear=new TQCheckBox(_("Use &linear mode"), modes); - connect(linear, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged())); + connect(linear, TQ_SIGNAL(clicked()), TQ_SIGNAL(configChanged())); TQWhatsThis::add(linear, _("Check this box if you want to use the linear mode.<br>Linear mode tells the boot loader the location of kernels in linear addressing rather than sector/head/cylinder.<br>linear mode is required for some SCSI drives, and shouldn't hurt unless you're planning to create a boot disk to be used with a different computer.<br>See the lilo.conf man page for details.")); compact=new TQCheckBox(_("Use &compact mode"), modes); - connect(compact, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged())); + connect(compact, TQ_SIGNAL(clicked()), TQ_SIGNAL(configChanged())); TQWhatsThis::add(compact, _("Check this box if you want to use the compact mode.<br>The compact mode tries to merge read requests for adjacent sectors into a single read request. This reduces load time and keeps the boot map smaller, but will not work on all systems.")); layout->addWidget(modes); TQHBox *opts=new TQHBox(this); lock=new TQCheckBox(_("&Record boot command lines for defaults"), opts); - connect(lock, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged())); + connect(lock, TQ_SIGNAL(clicked()), TQ_SIGNAL(configChanged())); TQWhatsThis::add(lock, "<qt>"+_("Checking this box enables automatic recording of boot command lines as the defaults for the following boots. This way, lilo \"locks\" on a choice until it is manually overridden.\nThis sets the <b>lock</b> option in lilo.conf.")); restricted=new TQCheckBox(_("R&estrict parameters"), opts); - connect(restricted, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged())); - connect(restricted, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw())); + connect(restricted, TQ_SIGNAL(clicked()), TQ_SIGNAL(configChanged())); + connect(restricted, TQ_SIGNAL(clicked()), TQ_SLOT(check_pw())); TQWhatsThis::add(restricted, _("If this box is checked, a password (entered below) is required only if any parameters are changed (i.e. the user can boot <i>linux</i>, but not <i>linux single</i> or <i>linux init=/bin/sh</i>).\nThis sets the <b>restricted</b> option in lilo.conf.<br>This sets a default for all Linux kernels you want to boot. If you need a per-kernel setting, go to the <i>Operating systems</i> tab and select <i>Details</i>.")); layout->addWidget(opts); TQHBox *pw=new TQHBox(this); use_password=new TQCheckBox(_("Require &password:"), pw); - connect(use_password, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged())); - connect(use_password, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw())); + connect(use_password, TQ_SIGNAL(clicked()), TQ_SIGNAL(configChanged())); + connect(use_password, TQ_SIGNAL(clicked()), TQ_SLOT(check_pw())); password=new TQLineEdit(pw); password->setMaxLength(15); password->setEchoMode(TQLineEdit::Password); - connect(password, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(configChanged())); + connect(password, TQ_SIGNAL(textChanged(const TQString &)), TQ_SIGNAL(configChanged())); TQWhatsThis::add(pw, _("Enter the password required for bootup (if any) here. If <i>restricted</i> above is checked, the password is required for additional parameters only.<br><b>WARNING:</b> The password is stored in clear text in /etc/lilo.conf. You'll want to make sure nobody untrusted can read this file. Also, you probably don't want to use your normal/root password here.<br>This sets a default for all Linux kernels you want to boot. If you need a per-kernel setting, go to the <i>Operating systems</i> tab and select <i>Details</i>.")); layout->addWidget(pw); @@ -124,12 +124,12 @@ General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(paren vga->insertItem(_("VGA 1280x1024, 32767 colors (793)")); vga->insertItem(_("VGA 1280x1024, 65536 colors (794)")); vga->insertItem(_("VGA 1280x1024, 16.7M colors (795)")); - connect( vga, TQT_SIGNAL(activated ( int )), TQT_SIGNAL(configChanged())); + connect( vga, TQ_SIGNAL(activated ( int )), TQ_SIGNAL(configChanged())); layout->addWidget(vgab); prompt=new TQCheckBox(_("Enter LILO &prompt automatically"), this); TQWhatsThis::add(prompt, _("If this box is checked, LILO goes to the LILO prompt whether or not a key is pressed. If it is turned off, LILO boots the default operating system unless shift is pressed (in that case, it goes to the LILO prompt).<br>This sets the <i>prompt</i> option in lilo.conf.")); - connect(prompt, TQT_SIGNAL(clicked()), TQT_SIGNAL(configChanged())); + connect(prompt, TQ_SIGNAL(clicked()), TQ_SIGNAL(configChanged())); layout->addWidget(prompt); diff --git a/lilo-config/kde-qt-common/general.h b/lilo-config/kde-qt-common/general.h index 5360177..cc8bb8d 100644 --- a/lilo-config/kde-qt-common/general.h +++ b/lilo-config/kde-qt-common/general.h @@ -35,7 +35,7 @@ #include <tqcheckbox.h> class General:public TQWidget { - Q_OBJECT + TQ_OBJECT public: General(liloconf *l=0, TQWidget *parent=0, const char *name=0); diff --git a/lilo-config/kde-qt-common/images.cpp b/lilo-config/kde-qt-common/images.cpp index 8b09749..17df335 100644 --- a/lilo-config/kde-qt-common/images.cpp +++ b/lilo-config/kde-qt-common/images.cpp @@ -49,7 +49,7 @@ Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, layout->setSpacing(SPACE_INSIDE); images=new TQListBox(this); layout->addWidget(images, 1); - connect(images, TQT_SIGNAL(highlighted(const TQString &)), TQT_SLOT(imageSelected(const TQString &))); + connect(images, TQ_SIGNAL(highlighted(const TQString &)), TQ_SLOT(imageSelected(const TQString &))); TQWhatsThis::add(images, _("This is the list of kernels and operating systems you can currently boot. Select which one you want to edit here.")); parameters=new TQVBox(this); @@ -58,19 +58,19 @@ Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, layout->addWidget(parameters, 2); image=new EditWidget(_("&Kernel:"), "", true, parameters); TQWhatsThis::add(image, _("Enter the filename of the kernel you want to boot here.")); - connect(image, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SIGNAL(configChanged())); + connect(image, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SIGNAL(configChanged())); label=new EditWidget(_("&Label:"), "", false, parameters); TQWhatsThis::add(label, _("Enter the label (name) of the kernel you want to boot here.")); - connect(label, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SIGNAL(configChanged())); + connect(label, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SIGNAL(configChanged())); root=new EditWidget(_("&Root filesystem:"), "", true, parameters); TQWhatsThis::add(root, _("Enter the root filesystem (i.e. the partition that will be mounted as / at boot time) for the kernel you want to boot here.")); - connect(root, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SIGNAL(configChanged())); + connect(root, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SIGNAL(configChanged())); initrd=new EditWidget(_("&Initial ramdisk:"), "", true, parameters); TQWhatsThis::add(initrd, _("If you want to use an initial ramdisk (initrd) for this kernel, enter its filename here. Leave this field blank if you don't intend to use an initial ramdisk for this kernel.")); - connect(initrd, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SIGNAL(configChanged())); + connect(initrd, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SIGNAL(configChanged())); append=new EditWidget(_("E&xtra parameters:"), "", false, parameters); TQWhatsThis::add(append, _("Enter any extra parameters you wish to pass to the kernel here. Usually, this can be left blank.<br>This sets the <i>append</i> option in lilo.conf.")); - connect(append, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SIGNAL(configChanged())); + connect(append, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SIGNAL(configChanged())); actions=new TQVBox(this); actions->setMargin(SPACE_MARGIN); @@ -78,24 +78,24 @@ Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, layout->addWidget(actions); dflt=new TQPushButton(_("Set &Default"), actions); TQWhatsThis::add(dflt, _("Boot this kernel/OS if the user doesn't make a different choice")); - connect(dflt, TQT_SIGNAL(clicked()), TQT_SLOT(dfltClicked())); + connect(dflt, TQ_SIGNAL(clicked()), TQ_SLOT(dfltClicked())); details=new TQPushButton(_("De&tails"), actions); TQWhatsThis::add(details, _("This button brings up a dialog box with further, less commonly used, options.")); - connect(details, TQT_SIGNAL(clicked()), TQT_SLOT(detailsClicked())); + connect(details, TQ_SIGNAL(clicked()), TQ_SLOT(detailsClicked())); probe=new TQPushButton(_("&Probe"), actions); - connect(probe, TQT_SIGNAL(clicked()), TQT_SLOT(probeClicked())); + connect(probe, TQ_SIGNAL(clicked()), TQ_SLOT(probeClicked())); TQWhatsThis::add(probe, _("Automatically generate a (hopefully) reasonable lilo.conf for your system")); check=new TQPushButton(_("&Check Configuration"), actions); - connect(check, TQT_SIGNAL(clicked()), TQT_SLOT(checkClicked())); + connect(check, TQ_SIGNAL(clicked()), TQ_SLOT(checkClicked())); TQWhatsThis::add(check, _("Run LILO in test mode to see if the configuration is ok")); addKrnl=new TQPushButton(_("Add &Kernel..."), actions); - connect(addKrnl, TQT_SIGNAL(clicked()), TQT_SLOT(addKrnlClicked())); + connect(addKrnl, TQ_SIGNAL(clicked()), TQ_SLOT(addKrnlClicked())); TQWhatsThis::add(addKrnl, _("Add a new Linux kernel to the boot menu")); addOS=new TQPushButton(_("Add Other &OS..."), actions); - connect(addOS, TQT_SIGNAL(clicked()), TQT_SLOT(addOSClicked())); + connect(addOS, TQ_SIGNAL(clicked()), TQ_SLOT(addOSClicked())); TQWhatsThis::add(addOS, _("Add a non-Linux OS to the boot menu")); remove=new TQPushButton(_("&Remove Entry"), actions); - connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeClicked())); + connect(remove, TQ_SIGNAL(clicked()), TQ_SLOT(removeClicked())); TQWhatsThis::add(remove, _("Remove entry from the boot menu")); update(); } diff --git a/lilo-config/kde-qt-common/images.h b/lilo-config/kde-qt-common/images.h index 9c01cad..99db7d7 100644 --- a/lilo-config/kde-qt-common/images.h +++ b/lilo-config/kde-qt-common/images.h @@ -38,7 +38,7 @@ #include "EditWidget.h" class Images:public TQWidget { - Q_OBJECT + TQ_OBJECT public: Images(liloconf *l=0, TQWidget *parent=0, const char *name=0); diff --git a/lilo-config/kde-qt-common/mainwidget.cpp b/lilo-config/kde-qt-common/mainwidget.cpp index bb966f2..5acdd81 100644 --- a/lilo-config/kde-qt-common/mainwidget.cpp +++ b/lilo-config/kde-qt-common/mainwidget.cpp @@ -34,16 +34,16 @@ MainWidget::MainWidget(TQWidget *parent, const char *name) { l=new liloconf(); general=new General(l, this); - connect(general, TQT_SIGNAL(configChanged()), TQT_SIGNAL(configChanged())); + connect(general, TQ_SIGNAL(configChanged()), TQ_SIGNAL(configChanged())); images=new Images(l, this); - connect(images, TQT_SIGNAL(configChanged()), TQT_SIGNAL(configChanged())); + connect(images, TQ_SIGNAL(configChanged()), TQ_SIGNAL(configChanged())); expert=new Expert(l, this); - connect(expert, TQT_SIGNAL(configChanged()), TQT_SIGNAL(configChanged())); - connect(expert, TQT_SIGNAL(configChanged()), images, TQT_SLOT(update())); + connect(expert, TQ_SIGNAL(configChanged()), TQ_SIGNAL(configChanged())); + connect(expert, TQ_SIGNAL(configChanged()), images, TQ_SLOT(update())); addTab(general, _("&General Options")); addTab(images, _("&Operating Systems")); addTab(expert, _("&Expert")); - connect(this, TQT_SIGNAL(selected(const TQString &)), TQT_SLOT(tabChanged(const TQString &))); + connect(this, TQ_SIGNAL(selected(const TQString &)), TQ_SLOT(tabChanged(const TQString &))); load(); arrangeWidgets(); } diff --git a/lilo-config/kde-qt-common/mainwidget.h b/lilo-config/kde-qt-common/mainwidget.h index 4331ffd..a48d29f 100644 --- a/lilo-config/kde-qt-common/mainwidget.h +++ b/lilo-config/kde-qt-common/mainwidget.h @@ -37,7 +37,7 @@ #include "expert.h" class MainWidget: public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: MainWidget(TQWidget *parent, const char *name=0); diff --git a/lilo-config/kde/Details.cpp b/lilo-config/kde/Details.cpp index 86e47bb..b54b3e2 100644 --- a/lilo-config/kde/Details.cpp +++ b/lilo-config/kde/Details.cpp @@ -82,12 +82,12 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags /* lock=new TQCheckBox(_("&Record boot command lines for defaults"), opts); TQWhatsThis::add(lock, "<qt>" + _("Checking this box enables automatic recording of boot command lines as the default for the following bootups. This way, lilo \"locks\" on a choice until it is manually overridden.<br>This sets the <b>lock</b> option in lilo.conf")); restricted=new TQCheckBox(_("R&estrict parameters"), opts); - connect(restricted, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw())); + connect(restricted, TQ_SIGNAL(clicked()), TQ_SLOT(check_pw())); TQWhatsThis::add(restricted, _("If this box is checked, a password (entered below) is required only if any parameters are changed (i.e. the user can boot <i>linux</i>, but not <i>linux single</i> or <i>linux init=/bin/sh</i>).\nThis sets the <b>restricted</b> option in lilo.conf.")); TQHBox *pw=new TQHBox(page); use_password=new TQCheckBox(_("Require &password:"), pw); - connect(use_password, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw())); + connect(use_password, TQ_SIGNAL(clicked()), TQ_SLOT(check_pw())); password=new TQLineEdit(pw); password->setMaxLength(15); password->setEchoMode(TQLineEdit::Password); diff --git a/lilo-config/kde/Details.h b/lilo-config/kde/Details.h index f2c70aa..9053e31 100644 --- a/lilo-config/kde/Details.h +++ b/lilo-config/kde/Details.h @@ -36,7 +36,7 @@ class Details:public KDialogBase { - Q_OBJECT + TQ_OBJECT public: Details(liloimage *lilo, TQWidget *parent=0, const char *name=0, WFlags f=0); diff --git a/lilo-config/kde/InputBox.h b/lilo-config/kde/InputBox.h index 90ffad4..ceeb361 100644 --- a/lilo-config/kde/InputBox.h +++ b/lilo-config/kde/InputBox.h @@ -38,7 +38,7 @@ #include <list> class InputBox:public KDialogBase { - Q_OBJECT + TQ_OBJECT public: typedef struct { TQString label; TQString dflt; bool isFile; TQString help; } entry; diff --git a/lilo-config/kde/kcontrol.cpp b/lilo-config/kde/kcontrol.cpp index bcce8aa..b12e218 100644 --- a/lilo-config/kde/kcontrol.cpp +++ b/lilo-config/kde/kcontrol.cpp @@ -41,7 +41,7 @@ KControl::KControl(TQWidget *parent, const char *name) TQVBoxLayout *layout=new TQVBoxLayout(this); m=new MainWidget(this, name); layout->addWidget(m); - connect(m, TQT_SIGNAL(configChanged()), TQT_SLOT(configChanged())); + connect(m, TQ_SIGNAL(configChanged()), TQ_SLOT(configChanged())); if (getuid() != 0) { m->makeReadOnly(); } diff --git a/lilo-config/kde/kcontrol.h b/lilo-config/kde/kcontrol.h index 18516fc..ba6b1ff 100644 --- a/lilo-config/kde/kcontrol.h +++ b/lilo-config/kde/kcontrol.h @@ -37,7 +37,7 @@ class TDEAboutData; class KControl: public TDECModule { - Q_OBJECT + TQ_OBJECT public: KControl(TQWidget *parent, const char *name); diff --git a/lilo-config/qt/Details.cpp b/lilo-config/qt/Details.cpp index 944ba0d..5bebba9 100644 --- a/lilo-config/qt/Details.cpp +++ b/lilo-config/qt/Details.cpp @@ -85,13 +85,13 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f): lock=new TQCheckBox(_("&Record boot command lines for defaults"), opts); TQWhatsThis::add(lock, "<qt>"+_("Checking this box enables automatic recording of boot command lines as the default for the following bootups. This way, lilo \"locks\" on a choice until it is manually overridden.<br>This sets the <b>lock</b> option in lilo.conf")); restricted=new TQCheckBox(_("R&estrict parameters"), opts); - connect(restricted, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw())); + connect(restricted, TQ_SIGNAL(clicked()), TQ_SLOT(check_pw())); TQWhatsThis::add(restricted, _("If this box is checked, a password (entered below) is required only if any parameters are changed (i.e. the user can boot <i>linux</i>, but not <i>linux single</i> or <i>linux init=/bin/sh</i>).\nThis sets the <b>restricted</b> option in lilo.conf.")); layout->addWidget(opts); TQHBox *pw=new TQHBox(this); use_password=new TQCheckBox(_("Require &password:"), pw); - connect(use_password, TQT_SIGNAL(clicked()), TQT_SLOT(check_pw())); + connect(use_password, TQ_SIGNAL(clicked()), TQ_SLOT(check_pw())); password=new TQLineEdit(pw); password->setMaxLength(15); password->setEchoMode(TQLineEdit::Password); @@ -102,8 +102,8 @@ Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f): ok=new TQPushButton(_("&OK"), btns); cancel=new TQPushButton(_("&Cancel"), btns); layout->addWidget(btns); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); if(l) { TQString mode=l->get("vga", "").cstr(); diff --git a/lilo-config/qt/Details.h b/lilo-config/qt/Details.h index ccfa66c..dc5dfaa 100644 --- a/lilo-config/qt/Details.h +++ b/lilo-config/qt/Details.h @@ -34,7 +34,7 @@ #include <tqpushbutton.h> class Details:public TQDialog { - Q_OBJECT + TQ_OBJECT public: Details(liloimage *lilo, TQWidget *parent=0, const char *name=0, WFlags f=0); diff --git a/lilo-config/qt/InputBox.cpp b/lilo-config/qt/InputBox.cpp index 9836a91..9c40569 100644 --- a/lilo-config/qt/InputBox.cpp +++ b/lilo-config/qt/InputBox.cpp @@ -47,10 +47,10 @@ InputBox::InputBox(entries e, TQWidget *parent, const char *name, bool hasCancel ok=new TQPushButton(_("&OK"), btns); cancel=new TQPushButton(_("&Cancel"), btns); layout->addWidget(btns); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); } else { ok=new TQPushButton(_("&OK"), this); layout->addWidget(ok); } - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); } diff --git a/lilo-config/qt/InputBox.h b/lilo-config/qt/InputBox.h index f1a5b78..c7f47c1 100644 --- a/lilo-config/qt/InputBox.h +++ b/lilo-config/qt/InputBox.h @@ -35,7 +35,7 @@ #include <list> class InputBox:public TQDialog { - Q_OBJECT + TQ_OBJECT public: typedef struct { TQString label; TQString dflt; bool isFile; TQString help; } entry; diff --git a/lilo-config/qt/standalone.cpp b/lilo-config/qt/standalone.cpp index 4dc73e2..d6bca94 100644 --- a/lilo-config/qt/standalone.cpp +++ b/lilo-config/qt/standalone.cpp @@ -36,31 +36,31 @@ Standalone::Standalone(TQWidget *parent, const char *name):TQWidget(parent,name) { m=new MainWidget(this); - connect(m, TQT_SIGNAL(configChanged()), TQT_SLOT(configChanged())); + connect(m, TQ_SIGNAL(configChanged()), TQ_SLOT(configChanged())); actions=new TQHButtonGroup(this); _whatsthis=new TQPushButton(_("&What's This?"), actions); _whatsthis->setAccel(SHIFT+Key_F1); TQWhatsThis::add(_whatsthis, _("The <i>What's This?</i> button is part of this program's help system. Click on the What's This? button then on any widget in the window to get information (like this) on it.")); - connect(_whatsthis, TQT_SIGNAL(clicked()), TQT_SLOT(whatsthis())); + connect(_whatsthis, TQ_SIGNAL(clicked()), TQ_SLOT(whatsthis())); _help=new TQPushButton(_("&Help"), actions); _help->setAccel(Key_F1); TQWhatsThis::add(_help, _("This button calls up the program's online help system. If it does nothing, no help file has been written (yet); in that case, use the <i>What's This</i> button on the left.")); - connect(_help, TQT_SIGNAL(clicked()), this, TQT_SLOT(help())); + connect(_help, TQ_SIGNAL(clicked()), this, TQ_SLOT(help())); _deflt=new TQPushButton(_("&Default"), actions); TQWhatsThis::add(_deflt, _("This button resets all parameters to some (hopefully sane) default values.")); - connect(_deflt, TQT_SIGNAL(clicked()), this, TQT_SLOT(defaults())); + connect(_deflt, TQ_SIGNAL(clicked()), this, TQ_SLOT(defaults())); _reset=new TQPushButton(_("&Reset"), actions); TQWhatsThis::add(_reset, _("This button resets all parameters to what they were before you started the program.")); - connect(_reset, TQT_SIGNAL(clicked()), this, TQT_SLOT(reset())); + connect(_reset, TQ_SIGNAL(clicked()), this, TQ_SLOT(reset())); _apply=new TQPushButton(_("&Apply"), actions); TQWhatsThis::add(_apply, _("This button saves all your changes without exiting.")); - connect(_apply, TQT_SIGNAL(clicked()), this, TQT_SLOT(apply())); + connect(_apply, TQ_SIGNAL(clicked()), this, TQ_SLOT(apply())); _ok=new TQPushButton(_("&OK"), actions); TQWhatsThis::add(_ok, _("This button saves all your changes and exits the program.")); - connect(_ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(ok())); + connect(_ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(ok())); _cancel=new TQPushButton(_("&Cancel"), actions); TQWhatsThis::add(_cancel, _("This button exits the program without saving your changes.")); - connect(_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(cancel())); + connect(_cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(cancel())); _apply->setEnabled(false); setMinimumWidth(actions->sizeHint().width()+10); arrangeWidgets(); @@ -118,7 +118,7 @@ int main(int argc, char **argv) { int ret; a.setStyle(new TQWindowsStyle()); a.setMainWidget(s); - TQObject::connect(s, TQT_SIGNAL(done()), &a, TQT_SLOT(quit())); + TQObject::connect(s, TQ_SIGNAL(done()), &a, TQ_SLOT(quit())); s->show(); ret=a.exec(); delete s; diff --git a/lilo-config/qt/standalone.h b/lilo-config/qt/standalone.h index 54a33f8..5487a5f 100644 --- a/lilo-config/qt/standalone.h +++ b/lilo-config/qt/standalone.h @@ -34,7 +34,7 @@ #include "mainwidget.h" class Standalone: public TQWidget { - Q_OBJECT + TQ_OBJECT public: Standalone(TQWidget *parent=0, const char *name=0); diff --git a/secpolicy/pamview.h b/secpolicy/pamview.h index 9b7e686..30e19eb 100644 --- a/secpolicy/pamview.h +++ b/secpolicy/pamview.h @@ -32,7 +32,7 @@ class TQListView; class PamView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: PamView(TQWidget *parent = 0, const char *name = 0); diff --git a/secpolicy/secpolicywin.cpp b/secpolicy/secpolicywin.cpp index 60ec46a..6ae60aa 100644 --- a/secpolicy/secpolicywin.cpp +++ b/secpolicy/secpolicywin.cpp @@ -42,10 +42,10 @@ SecPolicyWin::SecPolicyWin(const char *name) KMenuBar *mBar = menuBar(); TQPopupMenu *fileMenu = new TQPopupMenu(this); - fileMenu->insertItem(i18n("&Quit"), kapp, TQT_SLOT(closeAllWindows()), TDEStdAccel::shortcut(TDEStdAccel::Quit)); + fileMenu->insertItem(i18n("&Quit"), kapp, TQ_SLOT(closeAllWindows()), TDEStdAccel::shortcut(TDEStdAccel::Quit)); mBar->insertItem(i18n("&File"), fileMenu); - connect(kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit())); + connect(kapp, TQ_SIGNAL(lastWindowClosed()), kapp, TQ_SLOT(quit())); adjustSize(); // work around KTMainWindow sizing bug. diff --git a/tdefile-plugins/deb/tdefile_deb.h b/tdefile-plugins/deb/tdefile_deb.h index 3b8a9ab..c3507d7 100644 --- a/tdefile-plugins/deb/tdefile_deb.h +++ b/tdefile-plugins/deb/tdefile_deb.h @@ -26,7 +26,7 @@ class TQStringList; class KDebPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/rpm/tdefile_rpm.h b/tdefile-plugins/rpm/tdefile_rpm.h index 028f374..3e8d19a 100644 --- a/tdefile-plugins/rpm/tdefile_rpm.h +++ b/tdefile-plugins/rpm/tdefile_rpm.h @@ -26,7 +26,7 @@ class TQStringList; class KRpmPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/translations/desktop_files/kcron.desktop/pt_BR.po b/translations/desktop_files/kcron.desktop/pt_BR.po index bcae495..10c4b8b 100644 --- a/translations/desktop_files/kcron.desktop/pt_BR.po +++ b/translations/desktop_files/kcron.desktop/pt_BR.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-31 18:05+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-12-18 00:01+0000\n" +"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n" +"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/" +"weblate/projects/tdeadmin/kcron-kcrondesktop/pt_BR/>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.9.1\n" #. Name #: kcron.desktop:6 msgid "KCron" -msgstr "" +msgstr "KCron" #. GenericName #: kcron.desktop:7 diff --git a/translations/desktop_files/kcron.desktop/ru.po b/translations/desktop_files/kcron.desktop/ru.po index c99596d..b641caa 100644 --- a/translations/desktop_files/kcron.desktop/ru.po +++ b/translations/desktop_files/kcron.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-31 18:05+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-02 03:15+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeadmin/kcron-kcrondesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kcron.desktop:6 msgid "KCron" -msgstr "" +msgstr "KCron" #. GenericName #: kcron.desktop:7 diff --git a/translations/desktop_files/kdat.desktop/pt_BR.po b/translations/desktop_files/kdat.desktop/pt_BR.po index 556350b..c6cd6d8 100644 --- a/translations/desktop_files/kdat.desktop/pt_BR.po +++ b/translations/desktop_files/kdat.desktop/pt_BR.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-31 18:07+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-12-18 00:01+0000\n" +"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n" +"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/" +"weblate/projects/tdeadmin/kdat-kdatdesktop/pt_BR/>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.9.1\n" #. Name #: kdat.desktop:2 msgid "KDat" -msgstr "" +msgstr "KDat" #. GenericName #: kdat.desktop:3 diff --git a/translations/desktop_files/kdat.desktop/ru.po b/translations/desktop_files/kdat.desktop/ru.po index 985a07d..940db4f 100644 --- a/translations/desktop_files/kdat.desktop/ru.po +++ b/translations/desktop_files/kdat.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-31 18:07+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeadmin/kdat-kdatdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kdat.desktop:2 msgid "KDat" -msgstr "" +msgstr "KDat" #. GenericName #: kdat.desktop:3 diff --git a/translations/desktop_files/knetworkconf-desktops/ru.po b/translations/desktop_files/knetworkconf-desktops/ru.po index 60cd960..3dc9724 100644 --- a/translations/desktop_files/knetworkconf-desktops/ru.po +++ b/translations/desktop_files/knetworkconf-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-31 18:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeadmin/knetworkconf-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kcm_knetworkconfmodule.desktop:14 @@ -29,12 +31,12 @@ msgstr "Утилита настройки сети" #. Keywords #: kcm_knetworkconfmodule.desktop:16 msgid "Network;DNS;routes;interfaces;" -msgstr "" +msgstr "Network;DNS;routes;interfaces;сеть;интерфейсы;маршруты;" #. Name #: knetworkconf.desktop:8 msgid "KNetworkConf" -msgstr "" +msgstr "KNetworkConf" #. GenericName #: knetworkconf.desktop:9 diff --git a/translations/desktop_files/kpackage.desktop/gl.po b/translations/desktop_files/kpackage.desktop/gl.po index 0a9b01c..d1c6c91 100644 --- a/translations/desktop_files/kpackage.desktop/gl.po +++ b/translations/desktop_files/kpackage.desktop/gl.po @@ -1,28 +1,28 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Carlos Arjona <c.ad-r1@gmx.es>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-31 18:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-09-08 12:31+0000\n" +"Last-Translator: Carlos Arjona <c.ad-r1@gmx.es>\n" +"Language-Team: Galician <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeadmin/kpackage-kpackagedesktop/gl/>\n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kpackage.desktop:2 -#, fuzzy msgid "KPackage" -msgstr "Xestor de Pacotes" +msgstr "" #. GenericName #: kpackage.desktop:4 msgid "Package Manager" -msgstr "Xestor de Pacotes" +msgstr "Xestor de Paquetes" diff --git a/translations/desktop_files/kpackage.desktop/pt_BR.po b/translations/desktop_files/kpackage.desktop/pt_BR.po index 591a740..7be2e01 100644 --- a/translations/desktop_files/kpackage.desktop/pt_BR.po +++ b/translations/desktop_files/kpackage.desktop/pt_BR.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-31 18:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-12-18 00:01+0000\n" +"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n" +"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/" +"weblate/projects/tdeadmin/kpackage-kpackagedesktop/pt_BR/>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.9.1\n" #. Name #: kpackage.desktop:2 -#, fuzzy msgid "KPackage" -msgstr "Gerenciador de Pacotes" +msgstr "KPackage" #. GenericName #: kpackage.desktop:4 diff --git a/translations/desktop_files/kpackage.desktop/ru.po b/translations/desktop_files/kpackage.desktop/ru.po index 26a339f..69a2557 100644 --- a/translations/desktop_files/kpackage.desktop/ru.po +++ b/translations/desktop_files/kpackage.desktop/ru.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-31 18:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeadmin/kpackage-kpackagedesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kpackage.desktop:2 -#, fuzzy msgid "KPackage" -msgstr "Менеджер пакетов" +msgstr "KPackage" #. GenericName #: kpackage.desktop:4 diff --git a/translations/desktop_files/kpackage.desktop/tr.po b/translations/desktop_files/kpackage.desktop/tr.po index d24efad..e4bfa3d 100644 --- a/translations/desktop_files/kpackage.desktop/tr.po +++ b/translations/desktop_files/kpackage.desktop/tr.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Mehmet Dokuz <madanadam@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-31 18:16+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-04-12 19:00+0000\n" +"Last-Translator: Mehmet Dokuz <madanadam@gmail.com>\n" +"Language-Team: Turkish <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeadmin/kpackage-kpackagedesktop/tr/>\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.5.3\n" #. Name #: kpackage.desktop:2 -#, fuzzy msgid "KPackage" -msgstr "Paket Yöneticisi" +msgstr "KPaket" #. GenericName #: kpackage.desktop:4 diff --git a/translations/desktop_files/ksysv-desktops/pt_BR.po b/translations/desktop_files/ksysv-desktops/pt_BR.po index 4cbacec..87dc0a6 100644 --- a/translations/desktop_files/ksysv-desktops/pt_BR.po +++ b/translations/desktop_files/ksysv-desktops/pt_BR.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-31 18:21+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-12-18 00:01+0000\n" +"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n" +"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/" +"weblate/projects/tdeadmin/ksysv-desktop-files/pt_BR/>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.9.1\n" #. Name #: ksysv.desktop:2 msgid "KSysV" -msgstr "" +msgstr "KSysV" #. GenericName #: ksysv.desktop:4 diff --git a/translations/desktop_files/ksysv-desktops/ru.po b/translations/desktop_files/ksysv-desktops/ru.po index 527ed4a..06618db 100644 --- a/translations/desktop_files/ksysv-desktops/ru.po +++ b/translations/desktop_files/ksysv-desktops/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-31 18:21+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeadmin/ksysv-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: ksysv.desktop:2 msgid "KSysV" -msgstr "" +msgstr "KSysV" #. GenericName #: ksysv.desktop:4 diff --git a/translations/desktop_files/kuser.desktop/pt_BR.po b/translations/desktop_files/kuser.desktop/pt_BR.po index 9538045..b844d32 100644 --- a/translations/desktop_files/kuser.desktop/pt_BR.po +++ b/translations/desktop_files/kuser.desktop/pt_BR.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-31 19:17+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2021-12-18 00:01+0000\n" +"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n" +"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/" +"weblate/projects/tdeadmin/kuser-kuserdesktop/pt_BR/>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.9.1\n" #. Name #: kuser.desktop:2 msgid "KUser" -msgstr "" +msgstr "KUser" #. GenericName #: kuser.desktop:3 diff --git a/translations/desktop_files/kuser.desktop/ru.po b/translations/desktop_files/kuser.desktop/ru.po index 3b33929..70c34b3 100644 --- a/translations/desktop_files/kuser.desktop/ru.po +++ b/translations/desktop_files/kuser.desktop/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-31 19:17+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-06-04 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeadmin/kuser-kuserdesktop/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kuser.desktop:2 msgid "KUser" -msgstr "" +msgstr "KUser" #. GenericName #: kuser.desktop:3 |