summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cervisia/cervisiapart.cpp2
-rw-r--r--cervisia/cervisiashell.cpp8
-rw-r--r--kbabel/catalogmanager/catalogmanager.cpp184
-rw-r--r--kbabel/catalogmanager/markpatterndialog.cpp2
-rw-r--r--kbabel/catalogmanager/multiroughtransdlg.cpp2
-rw-r--r--kbabel/catalogmanager/validateprogress.cpp2
-rw-r--r--kbabel/commonui/context.cpp6
-rw-r--r--kbabel/commonui/finddialog.cpp2
-rw-r--r--kbabel/commonui/projectprefwidgets.cpp2
-rw-r--r--kbabel/kbabel/kbabel.cpp230
-rw-r--r--kbabel/kbabel/kbabelview.cpp6
-rw-r--r--kbabel/kbabeldict/kbabeldictbox.cpp6
-rw-r--r--kbugbuster/backend/mailsender.cpp2
-rw-r--r--kbugbuster/gui/kbbmainwindow.cpp62
-rw-r--r--kompare/kompare_shell.cpp28
-rw-r--r--kompare/komparenavtreepart/komparenavtreepart.cpp2
-rw-r--r--kompare/libdialogpages/diffpage.cpp2
-rw-r--r--kspy/spy.cpp8
-rw-r--r--kuiviewer/kuiviewer.cpp6
-rw-r--r--kuiviewer/kuiviewer_part.cpp4
-rw-r--r--scheck/scheck.cpp8
-rw-r--r--tdecachegrind/tdecachegrind/callgraphview.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/toplevel.cpp134
-rw-r--r--tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp2
-rw-r--r--umbrello/umbrello/associationwidget.cpp2
-rw-r--r--umbrello/umbrello/dialogs/activitypage.cpp6
-rw-r--r--umbrello/umbrello/dialogs/classifierlistpage.cpp6
-rw-r--r--umbrello/umbrello/dialogs/umloperationdialog.cpp6
-rw-r--r--umbrello/umbrello/uml.cpp94
-rw-r--r--umbrello/umbrello/umlviewcanvas.cpp2
30 files changed, 414 insertions, 414 deletions
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 63fb5976..2de0ef6c 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -322,7 +322,7 @@ void CervisiaPart::setupActions()
// View Menu
//
action = new TDEAction( i18n("Stop"), "process-stop", Key_Escape,
- TQT_TQOBJECT(protocol), TQT_SLOT(cancelJob()),
+ protocol, TQT_SLOT(cancelJob()),
actionCollection(), "stop_job" );
action->setEnabled( false );
hint = i18n("Stops any running sub-processes");
diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp
index 27fdb2dd..7cc0cb17 100644
--- a/cervisia/cervisiashell.cpp
+++ b/cervisia/cervisiashell.cpp
@@ -43,7 +43,7 @@ CervisiaShell::CervisiaShell( const char *name )
KLibFactory* factory = KLibLoader::self()->factory("libcervisiapart");
if( factory )
{
- m_part = static_cast<KParts::ReadOnlyPart*>(factory->create(TQT_TQOBJECT(this),
+ m_part = static_cast<KParts::ReadOnlyPart*>(factory->create(this,
"cervisiaview", "KParts::ReadOnlyPart"));
if( m_part )
setCentralWidget(m_part->widget());
@@ -92,19 +92,19 @@ void CervisiaShell::setupActions()
{
setStandardToolBarMenuEnabled( true );
- TDEAction *action = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolBars()),
+ TDEAction *action = KStdAction::configureToolbars( this, TQT_SLOT(slotConfigureToolBars()),
actionCollection() );
TQString hint = i18n("Allows you to configure the toolbar");
action->setToolTip( hint );
action->setWhatsThis( hint );
- action = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()),
+ action = KStdAction::keyBindings( this, TQT_SLOT(slotConfigureKeys()),
actionCollection() );
hint = i18n("Allows you to customize the keybindings");
action->setToolTip( hint );
action->setWhatsThis( hint );
- action = KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection() );
+ action = KStdAction::quit( kapp, TQT_SLOT( quit() ), actionCollection() );
hint = i18n("Exits Cervisia");
action->setToolTip( hint );
action->setWhatsThis( hint );
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index ceed6ce2..7e19c81e 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -115,7 +115,7 @@ void CatalogManager::init()
_foundFilesList.clear();
_toBeSearched.clear();
_timerFind = new TQTimer( this );
- connect(_timerFind, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT(findNextFile()) );
+ connect(_timerFind, TQT_SIGNAL( timeout() ), this, TQT_SLOT(findNextFile()) );
_searchStopped = false;
_prefDialog=0;
@@ -133,7 +133,7 @@ void CatalogManager::init()
}
connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
TQWidget *view = new TQWidget(this);
TQVBoxLayout* layout= new TQVBoxLayout(view);
@@ -145,7 +145,7 @@ void CatalogManager::init()
layout->setStretchFactor(_catalogManager,1);
connect(this,TQT_SIGNAL(settingsChanged(KBabel::CatManSettings))
- ,TQT_TQOBJECT(_catalogManager),TQT_SLOT(setSettings(KBabel::CatManSettings)));
+ ,_catalogManager,TQT_SLOT(setSettings(KBabel::CatManSettings)));
connect(_catalogManager,TQT_SIGNAL(openFile(TQString,TQString))
,this,TQT_SLOT(openFile(TQString,TQString)));
connect(_catalogManager,TQT_SIGNAL(openFileInNewWindow(TQString,TQString))
@@ -157,7 +157,7 @@ void CatalogManager::init()
connect(_catalogManager,TQT_SIGNAL(gotoFileEntry(TQString,TQString,int))
,this,TQT_SLOT(openFile(TQString,TQString,int)));
connect(_catalogManager, TQT_SIGNAL(selectedChanged(uint)),
- TQT_TQOBJECT(this), TQT_SLOT(selectedChanged(uint)));
+ this, TQT_SLOT(selectedChanged(uint)));
KWin::setIcons(winId(),BarIcon("catalogmanager",32)
,SmallIcon("catalogmanager"));
@@ -173,19 +173,19 @@ void CatalogManager::init()
_progressBar->hide();
connect(_catalogManager,TQT_SIGNAL(prepareProgressBar(TQString,int))
- , TQT_TQOBJECT(this), TQT_SLOT(prepareProgressBar(TQString,int)));
+ , this, TQT_SLOT(prepareProgressBar(TQString,int)));
connect(_catalogManager,TQT_SIGNAL(clearProgressBar())
- , TQT_TQOBJECT(this), TQT_SLOT(clearProgressBar()));
+ , this, TQT_SLOT(clearProgressBar()));
connect(_catalogManager,TQT_SIGNAL(progress(int))
, _progressBar, TQT_SLOT(setProgress(int)));
// connect(_catalogManager, TQT_SIGNAL(signalBuildTree(bool))
-// , TQT_TQOBJECT(this), TQT_SLOT(enableMenuForFiles(bool)));
+// , this, TQT_SLOT(enableMenuForFiles(bool)));
connect(_catalogManager, TQT_SIGNAL(signalBuildTree(bool))
- , TQT_TQOBJECT(this), TQT_SLOT(enableActions(bool)));
+ , this, TQT_SLOT(enableActions(bool)));
connect(this, TQT_SIGNAL(searchStopped())
- , TQT_TQOBJECT(_catalogManager), TQT_SLOT(stopSearch()));
+ , _catalogManager, TQT_SLOT(stopSearch()));
connect(_catalogManager, TQT_SIGNAL(prepareFindProgressBar(int))
- , TQT_TQOBJECT(this), TQT_SLOT(prepareStatusProgressBar(int)));
+ , this, TQT_SLOT(prepareStatusProgressBar(int)));
setCentralWidget(view);
resize( 600,300);
@@ -219,60 +219,60 @@ void CatalogManager::setupActions()
TDEAction *action;
// the file menu
- action = new TDEAction( i18n("&Open"), CTRL+Key_O, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Open"), CTRL+Key_O, _catalogManager,
TQT_SLOT(slotOpenFile()),actionCollection(), "open");
action->setEnabled(false);
- action = new TDEAction(i18n("&Open Template"),Key_Space,TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction(i18n("&Open Template"),Key_Space,_catalogManager,
TQT_SLOT(slotOpenTemplate()),actionCollection(), "open_template");
action->setEnabled(false);
- action = new TDEAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,_catalogManager,
TQT_SLOT(slotOpenFileInNewWindow()),actionCollection(), "open_new_window");
action->setEnabled(false);
- action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT (closeAllWindows()), actionCollection());
+ action = KStdAction::quit(kapp, TQT_SLOT (closeAllWindows()), actionCollection());
actionMap["open_template"] = NEEDS_POT;
// the edit menu
- action = new TDEAction( i18n("Fi&nd in Files..."), CTRL+Key_F, TQT_TQOBJECT(this),
+ action = new TDEAction( i18n("Fi&nd in Files..."), CTRL+Key_F, this,
TQT_SLOT(find()), actionCollection(), "find_in_files");
action->setEnabled(false);
- action = new TDEAction( i18n("Re&place in Files..."), CTRL+Key_R, TQT_TQOBJECT(this),
+ action = new TDEAction( i18n("Re&place in Files..."), CTRL+Key_R, this,
TQT_SLOT(replace()), actionCollection(), "replace_in_files");
action->setEnabled(false);
- action = new TDEAction( i18n("&Stop Searching"), "process-stop", Key_Escape, TQT_TQOBJECT(this),
+ action = new TDEAction( i18n("&Stop Searching"), "process-stop", Key_Escape, this,
TQT_SLOT(stopSearching()), actionCollection(), "stop_search");
action->setEnabled(false);
- action = new TDEAction( i18n("&Reload"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Reload"), "reload", TDEStdAccel::reload(), _catalogManager,
TQT_SLOT(updateCurrent()), actionCollection(), "reload");
action->setEnabled(false);
// the marking menu
- action = new TDEAction( i18n("&Toggle Marking"), CTRL+Key_M, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Toggle Marking"), CTRL+Key_M, _catalogManager,
TQT_SLOT(toggleMark()), actionCollection(), "toggle_marking");
action->setEnabled(false);
- action = new TDEAction( i18n("Remove Marking"), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("Remove Marking"), 0, _catalogManager,
TQT_SLOT(slotClearMarksInDir()), actionCollection(), "remove_marking");
action->setEnabled(false);
- action = new TDEAction( i18n("Toggle All Markings"), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("Toggle All Markings"), 0, _catalogManager,
TQT_SLOT(toggleAllMarks()), actionCollection(), "toggle_all_marking");
action->setEnabled(false);
- action = new TDEAction( i18n("Remove All Markings"), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("Remove All Markings"), 0, _catalogManager,
TQT_SLOT(clearAllMarks()), actionCollection(), "remove_all_marking");
action->setEnabled(false);
- action = new TDEAction( i18n("Mark Modified Files"), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("Mark Modified Files"), 0, _catalogManager,
TQT_SLOT(markModifiedFiles()), actionCollection(), "mark_modified_files");
// fixme to enabling this when loading is done using updateFinished() signal
action->setEnabled(true);
- action = new TDEAction( i18n("&Load Markings..."), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Load Markings..."), 0, _catalogManager,
TQT_SLOT(loadMarks()), actionCollection(), "load_marking");
action->setEnabled(false);
- action = new TDEAction( i18n("&Save Markings..."), 0, TQT_TQOBJECT(_catalogManager),
+ action = new TDEAction( i18n("&Save Markings..."), 0, _catalogManager,
TQT_SLOT(saveMarks()), actionCollection(), "save_marking");
action->setEnabled(false);
- (void)new TDEAction(i18n("&Mark Files..."), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction(i18n("&Mark Files..."), 0, _catalogManager,
TQT_SLOT(slotMarkPattern()), actionCollection(), "mark_pattern");
- (void)new TDEAction(i18n("&Unmark Files..."), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction(i18n("&Unmark Files..."), 0, _catalogManager,
TQT_SLOT(slotUnmarkPattern()), actionCollection(), "unmark_pattern");
actionMap["remove_marking"] = NEEDS_MARK;
@@ -282,102 +282,102 @@ void CatalogManager::setupActions()
// go menu
action = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated", ALT+Key_Next,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans");
+ _catalogManager, TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans");
action->setEnabled(false);
action = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated", ALT+Key_Prior,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans");
+ _catalogManager, TQT_SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans");
action->setEnabled(false);
action = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", CTRL+Key_Next,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy");
+ _catalogManager, TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy");
action->setEnabled(false);
action = new TDEAction(i18n("Pre&vious Fuzzy"), "prevfuzzy", CTRL+Key_Prior,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousFuzzy()),actionCollection(), "go_prev_fuzzy");
+ _catalogManager, TQT_SLOT(gotoPreviousFuzzy()),actionCollection(), "go_prev_fuzzy");
action->setEnabled(false);
action = new TDEAction(i18n("N&ext Fuzzy or Untranslated"), "nextfuzzyuntrans", CTRL+SHIFT+Key_Next,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextFuzzyOrUntranslated()),actionCollection(), "go_next_fuzzyUntr");
+ _catalogManager, TQT_SLOT(gotoNextFuzzyOrUntranslated()),actionCollection(), "go_next_fuzzyUntr");
action->setEnabled(false);
action = new TDEAction(i18n("P&revious Fuzzy or Untranslated"), "prevfuzzyuntrans", CTRL+SHIFT+Key_Prior,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr");
+ _catalogManager, TQT_SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr");
action->setEnabled(false);
action = new TDEAction(i18n("Next Err&or"), "nexterror", ALT+SHIFT+Key_Next,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error");
+ _catalogManager, TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error");
action->setEnabled(false);
action = new TDEAction(i18n("Previo&us Error"), "preverror", ALT+SHIFT+Key_Prior,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousError()),actionCollection(), "go_prev_error");
+ _catalogManager, TQT_SLOT(gotoPreviousError()),actionCollection(), "go_prev_error");
action->setEnabled(false);
action = new TDEAction(i18n("Next Te&mplate Only"), "nexttemplate", CTRL+Key_Down,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextTemplate()),actionCollection(), "go_next_template");
+ _catalogManager, TQT_SLOT(gotoNextTemplate()),actionCollection(), "go_next_template");
action->setEnabled(false);
action = new TDEAction(i18n("Previous Temp&late Only"), "prevtemplate", CTRL+Key_Up,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template");
+ _catalogManager, TQT_SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template");
action->setEnabled(false);
action = new TDEAction(i18n("Next Tran&slation Exists"), "nextpo", ALT+Key_Down,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextPo()),actionCollection(), "go_next_po");
+ _catalogManager, TQT_SLOT(gotoNextPo()),actionCollection(), "go_next_po");
action->setEnabled(false);
action = new TDEAction(i18n("Previous Transl&ation Exists"), "prevpo", ALT+Key_Up,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po");
+ _catalogManager, TQT_SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po");
action->setEnabled(false);
action = new TDEAction(i18n("Previous Marke&d"), "prevmarked", SHIFT+Key_Up,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked");
+ _catalogManager, TQT_SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked");
action->setEnabled(false);
action = new TDEAction(i18n("Next &Marked"), "nextmarked", SHIFT+Key_Down,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextMarked()),actionCollection(), "go_next_marked");
+ _catalogManager, TQT_SLOT(gotoNextMarked()),actionCollection(), "go_next_marked");
action->setEnabled(false);
// project menu
// the project menu
action = new TDEAction(i18n("&New..."), "document-new"
- , TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection()
+ , this, TQT_SLOT(projectNew()),actionCollection()
,"project_new");
action = new TDEAction(i18n("&Open..."), "document-open"
- , TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection()
+ , this, TQT_SLOT(projectOpen()),actionCollection()
,"project_open");
action = new TDEAction(i18n("C&lose"), "window-close"
- , TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection()
+ , this, TQT_SLOT(projectClose()),actionCollection()
,"project_close");
action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() );
action = new TDEAction(i18n("&Configure..."), "configure"
- , TQT_TQOBJECT(this), TQT_SLOT(projectConfigure()),actionCollection()
+ , this, TQT_SLOT(projectConfigure()),actionCollection()
,"project_settings");
// tools menu
action = new TDEAction( i18n("&Statistics"), "statistics", CTRL+Key_S,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(statistics()), actionCollection(), "statistics");
+ _catalogManager, TQT_SLOT(statistics()), actionCollection(), "statistics");
action->setEnabled(false);
action = new TDEAction( i18n("S&tatistics in Marked"), "statistics", CTRL+ALT+Key_S,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedStatistics()), actionCollection(), "statistics_marked");
+ _catalogManager, TQT_SLOT(markedStatistics()), actionCollection(), "statistics_marked");
action->setEnabled(false);
action = new TDEAction( i18n("Check S&yntax"), "syntax", CTRL+Key_Y,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(checkSyntax()), actionCollection(), "syntax");
+ _catalogManager, TQT_SLOT(checkSyntax()), actionCollection(), "syntax");
action->setEnabled(false);
action = new TDEAction( i18n("S&pell Check"), "tools-check-spelling", CTRL+Key_I,
- TQT_TQOBJECT(this), TQT_SLOT(spellcheck()), actionCollection(), "tools-check-spelling");
+ this, TQT_SLOT(spellcheck()), actionCollection(), "tools-check-spelling");
action->setEnabled(false);
action = new TDEAction( i18n("Spell Check in &Marked"), "tools-check-spelling", CTRL+ALT+Key_I,
- TQT_TQOBJECT(this), TQT_SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked");
+ this, TQT_SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked");
action->setEnabled(false);
action = new TDEAction( i18n("&Rough Translation"), CTRL+Key_T,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(roughTranslation()), actionCollection(), "rough_translation");
+ _catalogManager, TQT_SLOT(roughTranslation()), actionCollection(), "rough_translation");
action->setEnabled(false);
action = new TDEAction( i18n("Rough Translation in M&arked"), CTRL+ALT+Key_T,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked");
+ _catalogManager, TQT_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked");
action->setEnabled(false);
action = new TDEAction( i18n("Mai&l"), "mail-send", CTRL+Key_A,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailFiles()), actionCollection(), "mail_file");
+ _catalogManager, TQT_SLOT(mailFiles()), actionCollection(), "mail_file");
action->setEnabled(false);
action = new TDEAction( i18n("Mail Mar&ked"), "mail-send", CTRL+ALT+Key_A,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailMarkedFiles()), actionCollection(), "mail_file_marked");
+ _catalogManager, TQT_SLOT(mailMarkedFiles()), actionCollection(), "mail_file_marked");
action->setEnabled(false);
action = new TDEAction( i18n("&Pack"), "application-x-tar", CTRL+Key_B,
- TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageFiles()), actionCollection(), "package_file");
- action = new TDEAction( i18n("Pack &Marked"), "application-x-tar", CTRL+ALT+Key_B, TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked");
+ _catalogManager, TQT_SLOT(packageFiles()), actionCollection(), "package_file");
+ action = new TDEAction( i18n("Pack &Marked"), "application-x-tar", CTRL+ALT+Key_B, _catalogManager, TQT_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked");
action->setEnabled(false);
actionMap["statistics_marked"] = NEEDS_DIR | NEEDS_MARK;
@@ -393,7 +393,7 @@ void CatalogManager::setupActions()
TQValueList<KDataToolInfo> tools = ToolAction::validationTools();
TQPtrList<TDEAction> actions = ToolAction::dataToolActionList(
- tools, TQT_TQOBJECT(_catalogManager), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString& ))
+ tools, _catalogManager, TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString& ))
,"validate", false, actionCollection() );
TDEActionMenu* m_menu = new TDEActionMenu(i18n("&Validation"), actionCollection(),
@@ -407,7 +407,7 @@ void CatalogManager::setupActions()
}
actions = ToolAction::dataToolActionList(
- tools, TQT_TQOBJECT(_catalogManager), TQT_SLOT(validateMarkedUsingTool( const KDataToolInfo &, const TQString& ))
+ tools, _catalogManager, TQT_SLOT(validateMarkedUsingTool( const KDataToolInfo &, const TQString& ))
,"validate", false, actionCollection(), "marked_" );
m_menu = new TDEActionMenu(i18n("V&alidation Marked"), actionCollection(),
"dynamic_validation_marked");
@@ -422,19 +422,19 @@ void CatalogManager::setupActions()
// CVS submenu
// Actions for PO files
- (void)new TDEAction( i18n( "Update" ), "go-down", 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update" ), "go-down", 0, _catalogManager,
TQT_SLOT( cvsUpdate( ) ), actionCollection( ), "cvs_update" );
- (void)new TDEAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Marked" ), 0, _catalogManager,
TQT_SLOT( cvsUpdateMarked( ) ), actionCollection( ), "cvs_update_marked" );
- (void)new TDEAction( i18n( "Commit" ), "go-up", 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit" ), "go-up", 0, _catalogManager,
TQT_SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" );
- (void)new TDEAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Marked" ), 0, _catalogManager,
TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" );
- (void)new TDEAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status" ), 0, _catalogManager,
TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" );
- (void)new TDEAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status for Marked" ), 0, _catalogManager,
TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" );
- (void)new TDEAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Show Diff" ), 0, _catalogManager,
TQT_SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" );
// CVS
@@ -448,27 +448,27 @@ void CatalogManager::setupActions()
// SVN submenu
// Actions for PO files
- (void)new TDEAction( i18n( "Update" ), "go-down", 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update" ), "go-down", 0, _catalogManager,
TQT_SLOT( svnUpdate( ) ), actionCollection( ), "svn_update" );
- (void)new TDEAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Marked" ), 0, _catalogManager,
TQT_SLOT( svnUpdateMarked( ) ), actionCollection( ), "svn_update_marked" );
- (void)new TDEAction( i18n( "Commit" ), "go-up", 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit" ), "go-up", 0, _catalogManager,
TQT_SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" );
- (void)new TDEAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Marked" ), 0, _catalogManager,
TQT_SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" );
- (void)new TDEAction( i18n( "Status (Local)" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status (Local)" ), 0, _catalogManager,
TQT_SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" );
- (void)new TDEAction( i18n( "Status (Local) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status (Local) for Marked" ), 0, _catalogManager,
TQT_SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" );
- (void)new TDEAction( i18n( "Status (Remote)" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status (Remote)" ), 0, _catalogManager,
TQT_SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" );
- (void)new TDEAction( i18n( "Status (Remote) for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Status (Remote) for Marked" ), 0, _catalogManager,
TQT_SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" );
- (void)new TDEAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Show Diff" ), 0, _catalogManager,
TQT_SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" );
- (void)new TDEAction( i18n( "Show Information" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Show Information" ), 0, _catalogManager,
TQT_SLOT( svnInfo() ), actionCollection( ), "svn_info" );
- (void)new TDEAction( i18n( "Show Information for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Show Information for Marked" ), 0, _catalogManager,
TQT_SLOT( svnInfoMarked() ), actionCollection( ), "svn_info_marked" );
// SVN
@@ -485,13 +485,13 @@ void CatalogManager::setupActions()
actionMap["svn_info_marked"] = NEEDS_PO | NEEDS_PO_SVN | NEEDS_MARK;
// CVS Actions for POT files
- (void)new TDEAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Templates" ), 0, _catalogManager,
TQT_SLOT( cvsUpdateTemplate( ) ), actionCollection( ), "cvs_update_template" );
- (void)new TDEAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Marked Templates" ), 0, _catalogManager,
TQT_SLOT( cvsUpdateMarkedTemplate( ) ), actionCollection( ), "cvs_update_marked_template" );
- (void)new TDEAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Templates" ), 0, _catalogManager,
TQT_SLOT( cvsCommitTemplate( ) ), actionCollection( ), "cvs_commit_template" );
- (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, _catalogManager,
TQT_SLOT( cvsCommitMarkedTemplate( ) ), actionCollection( ), "cvs_commit_marked_template" );
actionMap["cvs_update_template"] = NEEDS_POT | NEEDS_POT_CVS;
@@ -500,13 +500,13 @@ void CatalogManager::setupActions()
actionMap["cvs_commit_marked_template"] = NEEDS_POT | NEEDS_POT_CVS | NEEDS_MARK;
// SVN Actions for POT files
- (void)new TDEAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Templates" ), 0, _catalogManager,
TQT_SLOT( svnUpdateTemplate( ) ), actionCollection( ), "svn_update_template" );
- (void)new TDEAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Update Marked Templates" ), 0, _catalogManager,
TQT_SLOT( svnUpdateMarkedTemplate( ) ), actionCollection( ), "svn_update_marked_template" );
- (void)new TDEAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Templates" ), 0, _catalogManager,
TQT_SLOT( svnCommitTemplate( ) ), actionCollection( ), "svn_commit_template" );
- (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager),
+ (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, _catalogManager,
TQT_SLOT( svnCommitMarkedTemplate( ) ), actionCollection( ), "svn_commit_marked_template" );
actionMap["svn_update_template"] = NEEDS_POT | NEEDS_POT_SVN;
@@ -530,7 +530,7 @@ void CatalogManager::setupActions()
actionCollection(), "file_commands");
_catalogManager->setFileCommandsMenu( actionMenu->popupMenu());
- action = new TDEAction(i18n("&Delete"),Key_Delete,TQT_TQOBJECT(_catalogManager),TQT_SLOT(slotDeleteFile()),actionCollection(), "delete");
+ action = new TDEAction(i18n("&Delete"),Key_Delete,_catalogManager,TQT_SLOT(slotDeleteFile()),actionCollection(), "delete");
action->setEnabled(false);
#if KDE_IS_VERSION( 3, 2, 90 )
@@ -1189,10 +1189,10 @@ void CatalogManager::projectNew()
if( p )
{
disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
_project = p;
connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
_configFile = _project->filename();
restoreSettings();
@@ -1218,10 +1218,10 @@ void CatalogManager::projectOpen()
if( p )
{
disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
_project = p;
connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
_configFile = p->filename();
restoreSettings();
@@ -1239,10 +1239,10 @@ void CatalogManager::projectOpen()
void CatalogManager::projectClose()
{
disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
_project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
connect( _project, TQT_SIGNAL (signalCatManSettingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
_configFile = _project->filename();
restoreSettings();
updateSettings();
@@ -1263,7 +1263,7 @@ void CatalogManager::projectConfigure()
KBabel::ProjectDialog* _projectDialog = new ProjectDialog(_project);
connect (_projectDialog, TQT_SIGNAL (settingsChanged())
- , TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
+ , this, TQT_SLOT (updateSettings()));
// settings are updated via signals
_projectDialog->exec();
diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp
index d4ff458d..bcb0c40c 100644
--- a/kbabel/catalogmanager/markpatterndialog.cpp
+++ b/kbabel/catalogmanager/markpatterndialog.cpp
@@ -127,7 +127,7 @@ void MarkPatternDialog::slotRegexpButtonClicked( )
{
if (!regexpEditDialog)
regexpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>(
- "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this));
+ "KRegExpEditor/KRegExpEditor", TQString(), this);
KRegExpEditorInterface * iface = dynamic_cast<KRegExpEditorInterface *>(regexpEditDialog);
diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp
index 841f8bbc..049b47a0 100644
--- a/kbabel/catalogmanager/multiroughtransdlg.cpp
+++ b/kbabel/catalogmanager/multiroughtransdlg.cpp
@@ -52,7 +52,7 @@ MultiRoughTransDlg::MultiRoughTransDlg(KBabelDictBox *dict, TQPtrList<CatManList
: RoughTransDlg(dict, new Catalog(), parent, name )
,_fileList(files)
{
- TQWidget* bars = TQT_TQWIDGET(progressbar->parent());
+ TQWidget* bars = static_cast<TQWidget*>(progressbar->parent());
TQLabel* label = new TQLabel( i18n("Files:"), bars );
filesProgressbar = new KProgress(bars,"files progressbar");
filesProgressbar->setTextEnabled(true);
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index 02c97738..7cabd133 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -133,7 +133,7 @@ void ValidateProgressDialog::validate_internal()
_mainWidget->_currentFileProgress->setTotalSteps(100);
_mainWidget->_currentFileProgress->setValue(0);
- it->checkErrors(_tool, TQT_TQOBJECT(_mainWidget), _ignoreFuzzy, _setAsFuzzy);
+ it->checkErrors(_tool, _mainWidget, _ignoreFuzzy, _setAsFuzzy);
bool noHeader = true;
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index 3d22cb2a..a0a83351 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -278,7 +278,7 @@ bool SourceContext::loadPart()
_view=0;
return false;
}
- _part = static_cast<KTextEditor::Document *>( factory->create( TQT_TQOBJECT(this), 0, "KTextEditor::Document" ) );
+ _part = static_cast<KTextEditor::Document *>( factory->create( this, 0, "KTextEditor::Document" ) );
if( !_part )
{
@@ -289,8 +289,8 @@ bool SourceContext::loadPart()
return false;
}
_view = _part->createView( this, 0 );
- _layout->addWidget(static_cast<TQWidget *>(_view), 1);
- static_cast<TQWidget *>(_view)->show();
+ _layout->addWidget(_view, 1);
+ _view->show();
return true;
}
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index 4f695fb4..df1d887b 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -520,7 +520,7 @@ void FindDialog::inButtonsClicked(int id)
void FindDialog::regExpButtonClicked()
{
if ( _regExpEditDialog == 0 )
- _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+ _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( _regExpEditDialog );
if( iface )
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index 203d28c0..29b051ff 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -778,7 +778,7 @@ void MiscPreferences::regExpButtonClicked()
{
if ( _regExpEditDialog==0 )
_regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>
- ("KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+ ("KRegExpEditor/KRegExpEditor", TQString(), this );
KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( _regExpEditDialog );
if( iface )
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 2bf4b2a0..3a8da899 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -217,18 +217,18 @@ void KBabelMW::init(KBCatalog* catalog)
connect(catalog,TQT_SIGNAL(signalTotalNumberChanged(uint)),this
,TQT_SLOT(setNumberOfTotal(uint)));
connect(catalog,TQT_SIGNAL(signalProgress(int)),_progressBar,TQT_SLOT(setProgress(int)));
- connect(catalog,TQT_SIGNAL(signalClearProgressBar()),TQT_TQOBJECT(this),TQT_SLOT(clearProgressBar()));
+ connect(catalog,TQT_SIGNAL(signalClearProgressBar()),this,TQT_SLOT(clearProgressBar()));
connect(catalog,TQT_SIGNAL(signalResetProgressBar(TQString,int))
- ,TQT_TQOBJECT(this),TQT_SLOT(prepareProgressBar(TQString,int)));
- connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),TQT_TQOBJECT(this),TQT_SLOT(enableDefaults(bool)));
+ ,this,TQT_SLOT(prepareProgressBar(TQString,int)));
+ connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),this,TQT_SLOT(enableDefaults(bool)));
connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),m_view,TQT_SLOT(newFileOpened(bool)));
- connect(catalog,TQT_SIGNAL(signalModified(bool)),TQT_TQOBJECT(this),TQT_SLOT(showModified(bool)));
+ connect(catalog,TQT_SIGNAL(signalModified(bool)),this,TQT_SLOT(showModified(bool)));
// allow the view to change the statusbar and caption
connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)),
- TQT_TQOBJECT(this), TQT_SLOT(changeStatusbar(const TQString&)));
+ this, TQT_SLOT(changeStatusbar(const TQString&)));
connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)),
- TQT_TQOBJECT(this), TQT_SLOT(changeCaption(const TQString&)));
+ this, TQT_SLOT(changeCaption(const TQString&)));
connect(m_view,TQT_SIGNAL(signalFirstDisplayed(bool, bool)),this
,TQT_SLOT(firstEntryDisplayed(bool, bool)));
connect(m_view,TQT_SIGNAL(signalLastDisplayed(bool, bool)),this
@@ -263,15 +263,15 @@ void KBabelMW::init(KBCatalog* catalog)
,TQT_SLOT(setLedColor(const TQColor&)));
- connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),TQT_TQOBJECT(this),TQT_SLOT(enableStop(bool)));
+ connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),this,TQT_SLOT(enableStop(bool)));
connect(m_view,TQT_SIGNAL(signalProgress(int)),_progressBar,TQT_SLOT(setProgress(int)));
- connect(m_view,TQT_SIGNAL(signalClearProgressBar()),TQT_TQOBJECT(this),TQT_SLOT(clearProgressBar()));
+ connect(m_view,TQT_SIGNAL(signalClearProgressBar()),this,TQT_SLOT(clearProgressBar()));
connect(m_view,TQT_SIGNAL(signalResetProgressBar(TQString,int))
- ,TQT_TQOBJECT(this),TQT_SLOT(prepareProgressBar(TQString,int)));
+ ,this,TQT_SLOT(prepareProgressBar(TQString,int)));
connect(m_view,TQT_SIGNAL(signalDictionariesChanged())
- , TQT_TQOBJECT(this), TQT_SLOT(buildDictMenus()));
+ , this, TQT_SLOT(buildDictMenus()));
connect(m_view,TQT_SIGNAL(signalCursorPosChanged(int,int)), this
, TQT_SLOT(updateCursorPosition(int,int)));
@@ -301,7 +301,7 @@ void KBabelMW::init(KBCatalog* catalog)
bmHandler, TQT_SLOT(slotClearBookmarks()));
}
connect(bmHandler, TQT_SIGNAL(signalBookmarkSelected(int)),
- TQT_TQOBJECT(this), TQT_SLOT(slotOpenBookmark(int)));
+ this, TQT_SLOT(slotOpenBookmark(int)));
connect(m_view, TQT_SIGNAL(signalNewFileOpened(KURL)),
bmHandler, TQT_SLOT(slotClearBookmarks()));
@@ -335,7 +335,7 @@ void KBabelMW::init(KBCatalog* catalog)
"set to %1. You may want to change this setting "
"according to the settings of your language team.").arg(encodingStr));
- TQTimer::singleShot(1,TQT_TQOBJECT(this),TQT_SLOT(projectConfigure()));
+ TQTimer::singleShot(1,this,TQT_SLOT(projectConfigure()));
}
_config->writeEntry("Version",VERSION);
@@ -404,68 +404,68 @@ void KBabelMW::setupActions()
TDEAction* action;
// the file menu
- action = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
+ action = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
- a_recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)), actionCollection());
+ a_recent = KStdAction::openRecent(this, TQT_SLOT(openRecent(const KURL&)), actionCollection());
a_recent->setMaxItems(MAX_RECENT);
- action = KStdAction::revert(TQT_TQOBJECT(m_view),TQT_SLOT(revertToSaved()),actionCollection());
- action=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection());
- action = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection());
- action = new TDEAction(i18n("Save Sp&ecial..."), 0, TQT_TQOBJECT(this), TQT_SLOT(fileSaveSpecial()),
+ action = KStdAction::revert(m_view,TQT_SLOT(revertToSaved()),actionCollection());
+ action=KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
+ action = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
+ action = new TDEAction(i18n("Save Sp&ecial..."), 0, this, TQT_SLOT(fileSaveSpecial()),
actionCollection(), "save_special" );
- action = new TDEAction(i18n("Set &Package..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(setFilePackage()),
+ action = new TDEAction(i18n("Set &Package..."), 0, m_view, TQT_SLOT(setFilePackage()),
actionCollection(), "set_package" );
- action = KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(fileMail()), actionCollection());
+ action = KStdAction::mail(this, TQT_SLOT(fileMail()), actionCollection());
- action = new TDEAction(i18n("&New View"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewView()),
+ action = new TDEAction(i18n("&New View"), 0, this, TQT_SLOT(fileNewView()),
actionCollection(), "file_new_view");
- action = new TDEAction(i18n("New &Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewWindow()),
+ action = new TDEAction(i18n("New &Window"), 0, this, TQT_SLOT(fileNewWindow()),
actionCollection(), "file_new_window");
action->setShortcut( TDEStdAccel::openNew() );
- action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection());
+ action = KStdAction::quit(this, TQT_SLOT(quit()), actionCollection());
// the edit menu
- action = KStdAction::undo(TQT_TQOBJECT(m_view), TQT_SLOT(undo()), actionCollection());
- action = KStdAction::redo(TQT_TQOBJECT(m_view), TQT_SLOT(redo()), actionCollection());
- action = KStdAction::cut(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalCut()), actionCollection());
- action = KStdAction::copy(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalCopy()), actionCollection());
- action = KStdAction::paste(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalPaste()), actionCollection());
- action = KStdAction::selectAll(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalSelectAll()), actionCollection());
- action = KStdAction::find(TQT_TQOBJECT(m_view), TQT_SLOT(find()), actionCollection());
- action = KStdAction::findNext(TQT_TQOBJECT(m_view), TQT_SLOT(findNext()), actionCollection());
- action = KStdAction::findPrev(TQT_TQOBJECT(m_view), TQT_SLOT(findPrev()), actionCollection());
- action = KStdAction::replace(TQT_TQOBJECT(m_view), TQT_SLOT(replace()), actionCollection());
-
- action = KStdAction::clear( TQT_TQOBJECT(m_view), TQT_SLOT(clear()), actionCollection(), "clear" );
-
- action = new TDEAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, TQT_TQOBJECT(m_view)
+ action = KStdAction::undo(m_view, TQT_SLOT(undo()), actionCollection());
+ action = KStdAction::redo(m_view, TQT_SLOT(redo()), actionCollection());
+ action = KStdAction::cut(m_view, TQT_SIGNAL(signalCut()), actionCollection());
+ action = KStdAction::copy(m_view, TQT_SIGNAL(signalCopy()), actionCollection());
+ action = KStdAction::paste(m_view, TQT_SIGNAL(signalPaste()), actionCollection());
+ action = KStdAction::selectAll(m_view, TQT_SIGNAL(signalSelectAll()), actionCollection());
+ action = KStdAction::find(m_view, TQT_SLOT(find()), actionCollection());
+ action = KStdAction::findNext(m_view, TQT_SLOT(findNext()), actionCollection());
+ action = KStdAction::findPrev(m_view, TQT_SLOT(findPrev()), actionCollection());
+ action = KStdAction::replace(m_view, TQT_SLOT(replace()), actionCollection());
+
+ action = KStdAction::clear( m_view, TQT_SLOT(clear()), actionCollection(), "clear" );
+
+ action = new TDEAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, m_view
,TQT_SLOT(msgid2msgstr()), actionCollection(), "msgid2msgstr");
action = new TDEAction(i18n("Copy Searc&h Result to Msgstr"), "search2msgstr",
- CTRL+ALT+Key_Space, TQT_TQOBJECT(m_view), TQT_SLOT(search2msgstr()),
+ CTRL+ALT+Key_Space, m_view, TQT_SLOT(search2msgstr()),
actionCollection(), "search2msgstr");
- action = new TDEAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, TQT_TQOBJECT(m_view)
+ action = new TDEAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, m_view
,TQT_SLOT(plural2msgstr()), actionCollection(), "plural2msgstr");
- action = new TDEAction(i18n("Copy Selected Character to Msgstr"), Key_F10, TQT_TQOBJECT(m_charselectorview)
+ action = new TDEAction(i18n("Copy Selected Character to Msgstr"), Key_F10, m_charselectorview
,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr");
- a_unsetFuzzy = new TDEAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view)
+ a_unsetFuzzy = new TDEAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, m_view
, TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy");
- action = new TDEAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()),
+ action = new TDEAction(i18n("&Edit Header..."), 0, m_view, TQT_SLOT(editHeader()),
actionCollection(), "edit_edit_header");
action = new TDEAction(i18n("&Insert Next Tag"), "insert_tag", CTRL+ALT+Key_N
- , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTag())
+ , m_view, TQT_SLOT(insertNextTag())
, actionCollection(),"insert_next_tag");
connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action
,TQT_SLOT(setEnabled(bool)));
action = new TDEAction(i18n("Insert Next Tag From Msgid P&osition"), "insert_tag", CTRL+Key_M
- , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTagMsgid())
+ , m_view, TQT_SLOT(insertNextTagMsgid())
, actionCollection(),"insert_next_tag_msgid");
connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action
,TQT_SLOT(setEnabled(bool)));
@@ -477,22 +477,22 @@ void KBabelMW::setupActions()
connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextTag()));
action = new TDEAction(i18n("Show Tags Menu"),CTRL+Key_Less
- , TQT_TQOBJECT(m_view), TQT_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu");
+ , m_view, TQT_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu");
action->setEnabled(false);
connect(m_view,TQT_SIGNAL(signalTagsAvailable(bool)),action
,TQT_SLOT(setEnabled(bool)));
action = new TDEAction(i18n("Move to Next Tag"), 0, CTRL+ALT+Key_M
- , TQT_TQOBJECT(m_view), TQT_SLOT(skipToNextTag())
+ , m_view, TQT_SLOT(skipToNextTag())
, actionCollection(),"move_to_next_tag");
action = new TDEAction(i18n("Move to Previous Tag"), 0, CTRL+ALT+Key_B
- , TQT_TQOBJECT(m_view), TQT_SLOT(skipToPreviousTag())
+ , m_view, TQT_SLOT(skipToPreviousTag())
, actionCollection(),"move_to_prev_tag");
action = new TDEAction(i18n("Insert Next Argument"), "insert_arg", CTRL+ALT+Key_G
- , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextArg())
+ , m_view, TQT_SLOT(insertNextArg())
, actionCollection(),"insert_next_arg");
connect(m_view,TQT_SIGNAL(signalNextArgAvailable(bool)),action
,TQT_SLOT(setEnabled(bool)));
@@ -504,7 +504,7 @@ void KBabelMW::setupActions()
connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(insertNextArg()));
action = new TDEAction(i18n("Show Arguments Menu"),CTRL+Key_Percent
- , TQT_TQOBJECT(m_view), TQT_SLOT(showArgsMenu()), actionCollection(),"show_args_menu");
+ , m_view, TQT_SLOT(showArgsMenu()), actionCollection(),"show_args_menu");
action->setEnabled(false);
connect(m_view,TQT_SIGNAL(signalArgsAvailable(bool)),action
@@ -512,181 +512,181 @@ void KBabelMW::setupActions()
// next, the go-menu
action = new TDEAction(i18n("&Previous"), "go-previous",
- TDEStdAccel::shortcut(TDEStdAccel::Prior), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoPrev()),
+ TDEStdAccel::shortcut(TDEStdAccel::Prior), m_view , TQT_SLOT(gotoPrev()),
actionCollection(),"go_prev_entry");
action = new TDEAction(i18n("&Next"), "go-next",
- TDEStdAccel::shortcut(TDEStdAccel::Next), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoNext()),
+ TDEStdAccel::shortcut(TDEStdAccel::Next), m_view , TQT_SLOT(gotoNext()),
actionCollection(),"go_next_entry");
- action = KStdAction::goTo(TQT_TQOBJECT(m_view), TQT_SLOT(gotoEntry()), actionCollection());
+ action = KStdAction::goTo(m_view, TQT_SLOT(gotoEntry()), actionCollection());
action->setShortcut( TDEStdAccel::gotoLine());
- action = KStdAction::firstPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoFirst()),actionCollection());
+ action = KStdAction::firstPage(m_view, TQT_SLOT(gotoFirst()),actionCollection());
action->setText(i18n("&First Entry"));
action->setShortcut(CTRL+ALT+Key_Home);
- action = KStdAction::lastPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoLast()),actionCollection());
+ action = KStdAction::lastPage(m_view, TQT_SLOT(gotoLast()),actionCollection());
action->setText(i18n("&Last Entry"));
action->setShortcut(CTRL+ALT+Key_End);
a_prevFoU = new TDEAction(i18n("P&revious Fuzzy or Untranslated"),"prevfuzzyuntrans",
- CTRL+SHIFT+Key_Prior, TQT_TQOBJECT(m_view),
+ CTRL+SHIFT+Key_Prior, m_view,
TQT_SLOT(gotoPrevFuzzyOrUntrans()),actionCollection(), "go_prev_fuzzyUntr");
a_nextFoU = new TDEAction(i18n("N&ext Fuzzy or Untranslated"),"nextfuzzyuntrans",
- CTRL+SHIFT+Key_Next, TQT_TQOBJECT(m_view),
+ CTRL+SHIFT+Key_Next, m_view,
TQT_SLOT(gotoNextFuzzyOrUntrans()),actionCollection(), "go_next_fuzzyUntr");
a_prevFuzzy = new TDEAction(i18n("Pre&vious Fuzzy"),"prevfuzzy",
- CTRL+Key_Prior, TQT_TQOBJECT(m_view),
+ CTRL+Key_Prior, m_view,
TQT_SLOT(gotoPrevFuzzy()),actionCollection(), "go_prev_fuzzy");
a_nextFuzzy = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy",
- CTRL+Key_Next, TQT_TQOBJECT(m_view),
+ CTRL+Key_Next, m_view,
TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy");
a_prevUntrans = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated",
- ALT+Key_Prior, TQT_TQOBJECT(m_view),
+ ALT+Key_Prior, m_view,
TQT_SLOT(gotoPrevUntranslated()),actionCollection(), "go_prev_untrans");
a_nextUntrans = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated",
- ALT+Key_Next, TQT_TQOBJECT(m_view),
+ ALT+Key_Next, m_view,
TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans");
action = new TDEAction(i18n("Previo&us Error"), "preverror",
- SHIFT+Key_Prior, TQT_TQOBJECT(m_view),
+ SHIFT+Key_Prior, m_view,
TQT_SLOT(gotoPrevError()),actionCollection(), "go_prev_error");
action = new TDEAction(i18n("Next Err&or"), "nexterror",
- SHIFT+Key_Next, TQT_TQOBJECT(m_view),
+ SHIFT+Key_Next, m_view,
TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error");
- action = new TDEAction(i18n("&Back in History"), "back", ALT+Key_Left, TQT_TQOBJECT(m_view),
+ action = new TDEAction(i18n("&Back in History"), "back", ALT+Key_Left, m_view,
TQT_SLOT(backHistory()),actionCollection(), "go_back_history");
- action = new TDEAction(i18n("For&ward in History"), "forward", ALT+Key_Right, TQT_TQOBJECT(m_view),
+ action = new TDEAction(i18n("For&ward in History"), "forward", ALT+Key_Right, m_view,
TQT_SLOT(forwardHistory()),actionCollection(), "go_forward_history");
// the search menu
actionMenu=new TDEActionMenu(i18n("&Find Text"),
"transsearch",actionCollection(),"dict_search_all");
connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(startSearch()));
- dictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
- connect(dictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
+ dictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
+ connect(dictMenu,TQT_SIGNAL(activated(const TQString)), m_view
, TQT_SLOT(startSearch(const TQString)));
actionMenu=new TDEActionMenu(i18n("F&ind Selected Text"),
"transsearch",actionCollection(),"dict_search_selected");
connect(actionMenu,TQT_SIGNAL(activated()),m_view,TQT_SLOT(startSelectionSearch()));
- selectionDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
- connect(selectionDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
+ selectionDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
+ connect(selectionDictMenu,TQT_SIGNAL(activated(const TQString)), m_view
, TQT_SLOT(startSelectionSearch(const TQString)));
actionMenu=new TDEActionMenu(i18n("&Edit Dictionary"),
"transsearch",actionCollection(),"dict_edit");
- editDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
- connect(editDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
+ editDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
+ connect(editDictMenu,TQT_SIGNAL(activated(const TQString)), m_view
, TQT_SLOT(editDictionary(const TQString)));
actionMenu=new TDEActionMenu(i18n("Con&figure Dictionary"),
"transsearch",actionCollection(),"dict_configure");
- configDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
- connect(configDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
+ configDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
+ connect(configDictMenu,TQT_SIGNAL(activated(const TQString)), m_view
, TQT_SLOT(configureDictionary(const TQString)));
actionMenu=new TDEActionMenu(i18n("About Dictionary"), "transsearch",
actionCollection(), "dict_about");
- aboutDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),TQT_TQOBJECT(this));
- connect(aboutDictMenu,TQT_SIGNAL(activated(const TQString)), TQT_TQOBJECT(m_view)
+ aboutDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this);
+ connect(aboutDictMenu,TQT_SIGNAL(activated(const TQString)), m_view
, TQT_SLOT(aboutDictionary(const TQString)));
buildDictMenus();
// the project menu
action = new TDEAction(i18n("&New..."), "document-new"
- , TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection()
+ , this, TQT_SLOT(projectNew()),actionCollection()
,"project_new");
action = new TDEAction(i18n("&Open..."), "document-open"
- , TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection()
+ , this, TQT_SLOT(projectOpen()),actionCollection()
,"project_open");
action = new TDEAction(i18n("C&lose"), "window-close"
- , TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection()
+ , this, TQT_SLOT(projectClose()),actionCollection()
,"project_close");
action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() );
action = new TDEAction(i18n("&Configure..."), "configure"
- , TQT_TQOBJECT(this), TQT_SLOT(projectConfigure()),actionCollection()
+ , this, TQT_SLOT(projectConfigure()),actionCollection()
,"project_settings");
- a_recentprojects = new TDERecentFilesAction(i18n("Open &Recent"), 0, TQT_TQOBJECT(this), TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects");
+ a_recentprojects = new TDERecentFilesAction(i18n("Open &Recent"), 0, this, TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects");
// the tools menu
action = new TDEAction(i18n("&Spell Check..."), "tools-check-spelling", CTRL+Key_I
- , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCommon()),actionCollection()
+ , m_view, TQT_SLOT(spellcheckCommon()),actionCollection()
,"spellcheck_common");
action = new TDEAction(i18n("&Check All..."), "spellcheck_all", 0
- , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAll()),actionCollection()
+ , m_view, TQT_SLOT(spellcheckAll()),actionCollection()
,"spellcheck_all");
action = new TDEAction(i18n("C&heck From Cursor Position..."), "spellcheck_from_cursor", 0
- , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCursor()),actionCollection()
+ , m_view, TQT_SLOT(spellcheckFromCursor()),actionCollection()
,"spellcheck_from_cursor");
action = new TDEAction(i18n("Ch&eck Current..."), "spellcheck_actual", 0
- , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCurrent()),actionCollection()
+ , m_view, TQT_SLOT(spellcheckCurrent()),actionCollection()
,"spellcheck_current");
action = new TDEAction(i18n("Check Fro&m Current to End of File..."), 0
- , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCurrent()),actionCollection()
+ , m_view, TQT_SLOT(spellcheckFromCurrent()),actionCollection()
,"spellcheck_from_current");
action = new TDEAction(i18n("Chec&k Selected Text..."), "spellcheck_selected", 0
- , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckMarked()),actionCollection()
+ , m_view, TQT_SLOT(spellcheckMarked()),actionCollection()
,"spellcheck_marked");
TDEToggleAction *toggleAction;
toggleAction = new TDEToggleAction(i18n("&Diffmode"), "autodiff", 0
,actionCollection(), "diff_toggleDiff");
- connect(toggleAction,TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_view), TQT_SLOT(toggleAutoDiff(bool)));
+ connect(toggleAction,TQT_SIGNAL(toggled(bool)), m_view, TQT_SLOT(toggleAutoDiff(bool)));
connect(m_view,TQT_SIGNAL(signalDiffEnabled(bool)), toggleAction
, TQT_SLOT(setChecked(bool)));
toggleAction->setChecked(m_view->autoDiffEnabled());
action = new TDEAction(i18n("&Show Diff"), "diff", Key_F5
- , TQT_TQOBJECT(m_view), TQT_SLOT(diff()),actionCollection()
+ , m_view, TQT_SLOT(diff()),actionCollection()
,"diff_diff");
action = new TDEAction(i18n("S&how Original Text"), "contents", Key_F6
- , TQT_TQOBJECT(m_view), TQT_SLOT(diffShowOrig()),actionCollection()
+ , m_view, TQT_SLOT(diffShowOrig()),actionCollection()
,"diff_showOrig");
action = new TDEAction(i18n("&Open File for Diff"), "document-open" ,0
- , TQT_TQOBJECT(m_view), TQT_SLOT(openDiffFile()),actionCollection()
+ , m_view, TQT_SLOT(openDiffFile()),actionCollection()
,"diff_openFile");
action = new TDEAction(i18n("&Rough Translation..."), 0
- , TQT_TQOBJECT(m_view), TQT_SLOT(roughTranslation()),actionCollection()
+ , m_view, TQT_SLOT(roughTranslation()),actionCollection()
,"rough_translation");
- action = new TDEAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , TQT_TQOBJECT(this),
+ action = new TDEAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , this,
TQT_SLOT(openCatalogManager()),actionCollection(), "open_catalog_manager");
- new TDEAction( i18n("Toggle Edit Mode"), 0, Key_Insert,TQT_TQOBJECT(this),TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode");
+ new TDEAction( i18n("Toggle Edit Mode"), 0, Key_Insert,this,TQT_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode");
- new TDEAction( i18n("&Word Count"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(wordCount()), actionCollection(), "word_count");
+ new TDEAction( i18n("&Word Count"), 0, m_view, TQT_SLOT(wordCount()), actionCollection(), "word_count");
// next, the settings menu
createStandardStatusBarAction();
- KStdAction::configureToolbars(TQT_TQOBJECT(this),TQT_SLOT(optionsEditToolbars()),actionCollection());
+ KStdAction::configureToolbars(this,TQT_SLOT(optionsEditToolbars()),actionCollection());
KStdAction::keyBindings(guiFactory(),TQT_SLOT(configureShortcuts()),actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this),TQT_SLOT(optionsPreferences()),actionCollection());
+ KStdAction::preferences(this,TQT_SLOT(optionsPreferences()),actionCollection());
setStandardToolBarMenuEnabled ( true );
- action = new TDEAction(i18n("&Stop Searching"), "process-stop",Key_Escape, TQT_TQOBJECT(m_view),
+ action = new TDEAction(i18n("&Stop Searching"), "process-stop",Key_Escape, m_view,
TQT_SLOT(stopSearch()),actionCollection(), "stop_search");
action->setEnabled(false);
- new TDEAction(i18n("&Gettext Info"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Gettext Info"), 0, this,
TQT_SLOT(gettextHelp()), actionCollection(), "help_gettext");
// the bookmarks menu
- action = KStdAction::addBookmark(TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()),
+ action = KStdAction::addBookmark(this, TQT_SLOT(slotAddBookmark()),
actionCollection(), "add_bookmark");
action->setEnabled(false);
// this action is now connected to dummySlot(), and later reconnected
// to bmHandler after that object actually is created
- new TDEAction(i18n("Clear Bookmarks"), 0, TQT_TQOBJECT(this), TQT_SLOT(dummySlot()),
+ new TDEAction(i18n("Clear Bookmarks"), 0, this, TQT_SLOT(dummySlot()),
actionCollection(), "clear_bookmarks");
setupDynamicActions();
@@ -759,19 +759,19 @@ void KBabelMW::setupDynamicActions()
TQValueList<KDataToolInfo> tools = ToolAction::validationTools();
TQPtrList<TDEAction> actions = ToolAction::dataToolActionList(
- tools, TQT_TQOBJECT(m_view), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )),
+ tools, m_view, TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )),
"validate", false, actionCollection() );
TDEActionMenu* m_menu = new TDEActionMenu(i18n("&Validation"), actionCollection(), "dynamic_validation_tools");
- TDEAction* ac = new TDEAction(i18n("Perform &All Checks"), CTRL+Key_E , TQT_TQOBJECT(m_view),
+ TDEAction* ac = new TDEAction(i18n("Perform &All Checks"), CTRL+Key_E , m_view,
TQT_SLOT(checkAll()),actionCollection(), "check_all");
ac->setEnabled(false);
m_menu->insert(ac);
m_menu->insert( new TDEActionSeparator() );
- ac = new TDEAction(i18n("C&heck Syntax"), CTRL+Key_T , TQT_TQOBJECT(m_view),
+ ac = new TDEAction(i18n("C&heck Syntax"), CTRL+Key_T , m_view,
TQT_SLOT(checkSyntax()),actionCollection(), "check_syntax");
ac->setEnabled(false);
m_menu->insert(ac);
@@ -801,7 +801,7 @@ void KBabelMW::setupDynamicActions()
// create corresponding actions
actions = ToolAction::dataToolActionList(
- modifyTools, TQT_TQOBJECT(m_view), TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )),
+ modifyTools, m_view, TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )),
"validate", true, actionCollection() );
// skip validation actions
@@ -833,7 +833,7 @@ void KBabelMW::setupDynamicActions()
// create corresponding actions
actions = ToolAction::dataToolActionList(
- modifyTools, TQT_TQOBJECT(m_view), TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )),
+ modifyTools, m_view, TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )),
"validate", true, actionCollection() );
// skip validation actions
@@ -844,7 +844,7 @@ void KBabelMW::setupDynamicActions()
// create corresponding actions
actions = ToolAction::dataToolActionList(
- modifyTools, TQT_TQOBJECT(m_view), TQT_SLOT(modifyCatalogUsingTool( const KDataToolInfo &, const TQString & )),
+ modifyTools, m_view, TQT_SLOT(modifyCatalogUsingTool( const KDataToolInfo &, const TQString & )),
"validate", true, actionCollection() );
// insert tools
@@ -923,7 +923,7 @@ bool KBabelMW::queryClose()
{
if(m_view->isSearching())
{
- connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),TQT_TQOBJECT(this),TQT_SLOT(quit()));
+ connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),this,TQT_SLOT(quit()));
m_view->stopSearch();
return false;
}
@@ -932,7 +932,7 @@ bool KBabelMW::queryClose()
{
// stop the activity and try again
m_view->catalog()->stop();
- TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT( close() ));
+ TQTimer::singleShot(0, this, TQT_SLOT( close() ));
return false;
}
@@ -1067,7 +1067,7 @@ void KBabelMW::addToRecentFiles(KURL url)
void KBabelMW::fileSave()
{
// do it asynchronously due to tdelibs bug
- TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( fileSave_internal() ));
+ TQTimer::singleShot( 0, this, TQT_SLOT( fileSave_internal() ));
}
void KBabelMW::fileSave_internal()
@@ -1181,7 +1181,7 @@ void KBabelMW::optionsEditToolbars()
{
saveMainWindowSettings( TDEGlobal::config(), "View" );
KEditToolbar dlg(actionCollection());
- connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(newToolbarConfig()));
+ connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig()));
dlg.exec();
}
@@ -1621,7 +1621,7 @@ KBabelMW *KBabelMW::winForURL(const KURL& url, TQString project)
}
if(p)
- kb = static_cast<KBabelMW*>(TQT_TQWIDGET(p));
+ kb = static_cast<KBabelMW*>(p);
}
return kb;
@@ -1641,7 +1641,7 @@ KBabelMW *KBabelMW::emptyWin(TQString project)
}
if(p)
- kb = static_cast<KBabelMW*>(TQT_TQWIDGET(p));
+ kb = static_cast<KBabelMW*>(p);
}
return kb;
@@ -1651,7 +1651,7 @@ void KBabelMW::spellcheckMoreFiles(TQStringList filelist)
{
if( filelist.isEmpty() ) return;
_toSpellcheck = filelist;
- connect( m_view, TQT_SIGNAL( signalSpellcheckDone(int) ), TQT_TQOBJECT(this), TQT_SLOT( spellcheckDone(int)));
+ connect( m_view, TQT_SIGNAL( signalSpellcheckDone(int) ), this, TQT_SLOT( spellcheckDone(int)));
spellcheckDone( KS_IGNORE ); // use something else than KS_STOP
}
@@ -1659,7 +1659,7 @@ void KBabelMW::spellcheckDone( int result)
{
if( _toSpellcheck.isEmpty() || result == KS_STOP)
{
- disconnect( m_view, TQT_SIGNAL( signalSpellcheckDone(int)), TQT_TQOBJECT(this), TQT_SLOT(spellcheckDone( int)));
+ disconnect( m_view, TQT_SIGNAL( signalSpellcheckDone(int)), this, TQT_SLOT(spellcheckDone( int)));
KMessageBox::information( this, i18n("MessageBox text", "Spellchecking of multiple files is finished."),
i18n("MessageBox caption", "Spellcheck Done"));
}
@@ -1670,7 +1670,7 @@ void KBabelMW::spellcheckDone( int result)
if( m_view->isModified() ) fileSave();
open(KURL( file ), TQString(), false);
kdDebug(KBABEL) << "Starting another spellcheck" << endl;
- TQTimer::singleShot( 1, TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAllMulti()));
+ TQTimer::singleShot( 1, m_view, TQT_SLOT(spellcheckAllMulti()));
}
}
@@ -1793,7 +1793,7 @@ void KBabelMW::projectConfigure()
{
_projectDialog = new ProjectDialog(_project);
connect (_projectDialog, TQT_SIGNAL (settingsChanged())
- , TQT_TQOBJECT(m_view), TQT_SLOT (updateProjectSettings()));
+ , m_view, TQT_SLOT (updateProjectSettings()));
}
int prefHeight=_projectDialog->height();
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index a96c5a72..c630314e 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -376,7 +376,7 @@ of the currently displayed entry.</p></qt>"));
connect (this, TQT_SIGNAL (signalCut ()), m_commentview, TQT_SLOT (textCut ()));
connect (this, TQT_SIGNAL (signalPaste ()), m_commentview, TQT_SLOT (textPaste ()));
connect (this, TQT_SIGNAL (signalSelectAll ()), m_commentview, TQT_SLOT (textSelectAll ()));
- m_commentview->installEventFilter( TQT_TQOBJECT(this) );
+ m_commentview->installEventFilter( this );
// build the msgstr widget
tempWidget=new TQWidget(this,"msgstrWidget");
@@ -770,7 +770,7 @@ void KBabelView::readProject(Project::Ptr project)
spell2.config->setEncoding(_spellcheckSettings.spellEncoding);
spell2.config->setDictionary(_spellcheckSettings.spellDict);
- spell2.tdespell= new KSpell(this, "", TQT_TQOBJECT(this), TQT_SLOT(dummy(KSpell *)),
+ spell2.tdespell= new KSpell(this, "", this, TQT_SLOT(dummy(KSpell *)),
spell2.config, false, false);
if(spell2.tdespell->status() == KSpell::Error)
kdWarning(KBABEL) << "Something's wrong with KSpell, can't start on-the-fly checking" << endl;
@@ -3943,7 +3943,7 @@ void KBabelView::spellcheck()
_dontBeep=true;
spell.tdespell= new KSpell (this, i18n("Spellcheck"),
- TQT_TQOBJECT(this), TQT_SLOT(spellStart(KSpell *)), spell.config, true, true);
+ this, TQT_SLOT(spellStart(KSpell *)), spell.config, true, true);
if( spell.tdespell->status() == KSpell::Error )
{
KMessageBox::error( this, i18n("KBabel cannot start spell checker. "
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index 1be091ff..a459332e 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -388,7 +388,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
if(factory)
{
- SearchEngine *e = (SearchEngine *)factory->create(TQT_TQOBJECT(this)
+ SearchEngine *e = (SearchEngine *)factory->create(this
, "searchengine", "SearchEngine");
if(!e)
{
@@ -419,7 +419,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
if(factory)
{
- SearchEngine *e = (SearchEngine *)factory->create(TQT_TQOBJECT(this)
+ SearchEngine *e = (SearchEngine *)factory->create(this
, "searchengine", "SearchEngine");
if(!e)
{
@@ -447,7 +447,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
if(factory)
{
- SearchEngine *e = (SearchEngine *)factory->create(TQT_TQOBJECT(this)
+ SearchEngine *e = (SearchEngine *)factory->create(this
, "searchengine", "SearchEngine");
if(!e)
{
diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp
index 8420cbf9..2d05d759 100644
--- a/kbugbuster/backend/mailsender.cpp
+++ b/kbugbuster/backend/mailsender.cpp
@@ -170,7 +170,7 @@ void MailSender::smtpError(const TQString &_command, const TQString &_response)
smtp->removeChild( this );
delete smtp;
- KMessageBox::error( TQT_TQWIDGET(tqApp->activeWindow()),
+ KMessageBox::error( tqApp->activeWindow(),
i18n( "Error during SMTP transfer.\n"
"command: %1\n"
"response: %2" ).arg( command ).arg( response ) );
diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp
index ed61ce52..e1805632 100644
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@@ -144,68 +144,68 @@ KBBMainWindow::~KBBMainWindow()
void KBBMainWindow::initActions()
{
// Prepare and create XML GUI
- fileQuit = KStdAction::quit( TQT_TQOBJECT(this),
+ fileQuit = KStdAction::quit( this,
TQT_SLOT( close() ), actionCollection() );
fileQuit->setToolTip( i18n( "Quit KBugBuster" ) );
- new TDEAction( i18n("See &Pending Changes"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotListChanges() ),
+ new TDEAction( i18n("See &Pending Changes"), "contents", 0, this, TQT_SLOT( slotListChanges() ),
actionCollection(), "file_seechanges" );
- new TDEAction( i18n("&Submit Changes"), "mail-send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ),
+ new TDEAction( i18n("&Submit Changes"), "mail-send", 0, this, TQT_SLOT( slotSubmit() ),
actionCollection(), "file_submit" );
- reloadpacklist = new TDEAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackageList() ),
+ reloadpacklist = new TDEAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, m_mainWidget, TQT_SLOT( slotReloadPackageList() ),
actionCollection(), "reload_packagelist" );
- reloadpack= new TDEAction( i18n("Reload Bug &List (for current product)"), "reload", TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackage() ),
+ reloadpack= new TDEAction( i18n("Reload Bug &List (for current product)"), "reload", TQt::Key_F5, m_mainWidget, TQT_SLOT( slotReloadPackage() ),
actionCollection(), "reload_package" );
- reloadbug = new TDEAction( i18n("Reload Bug &Details (for current bug)"), "reload", SHIFT+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadBug() ),
+ reloadbug = new TDEAction( i18n("Reload Bug &Details (for current bug)"), "reload", SHIFT+TQt::Key_F5, m_mainWidget, TQT_SLOT( slotReloadBug() ),
actionCollection(), "reload_bug" );
- loadMyBugs = new TDEAction( i18n( "Load &My Bugs List" ), 0, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotLoadMyBugs() ),
+ loadMyBugs = new TDEAction( i18n( "Load &My Bugs List" ), 0, m_mainWidget, TQT_SLOT( slotLoadMyBugs() ),
actionCollection(), "load_my_bugs" );
- reloadall = new TDEAction( i18n("Load All Bug Details (for current product)"), TQt::Key_F6, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotRetrieveAllBugDetails() ), actionCollection(), "load_allbugs" );
- new TDEAction( i18n("Extract &Attachments"), "document-save", TQt::Key_F4, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotExtractAttachments() ),
+ reloadall = new TDEAction( i18n("Load All Bug Details (for current product)"), TQt::Key_F6, m_mainWidget, TQT_SLOT( slotRetrieveAllBugDetails() ), actionCollection(), "load_allbugs" );
+ new TDEAction( i18n("Extract &Attachments"), "document-save", TQt::Key_F4, m_mainWidget, TQT_SLOT( slotExtractAttachments() ),
actionCollection(), "extract_attachments" );
- new TDEAction( i18n("Clear Cache"), 0, TQT_TQOBJECT(this), TQT_SLOT( clearCache() ),
+ new TDEAction( i18n("Clear Cache"), 0, this, TQT_SLOT( clearCache() ),
actionCollection(), "clear_cache" );
- new TDEAction( i18n("&Search by Product..."), "goto", CTRL+TQt::Key_P, TQT_TQOBJECT(this),
+ new TDEAction( i18n("&Search by Product..."), "goto", CTRL+TQt::Key_P, this,
TQT_SLOT( searchPackage() ), actionCollection(), "search_package" );
- new TDEAction( i18n("Search by Bug &Number..."), "filefind", CTRL+TQt::Key_N, TQT_TQOBJECT(this),
+ new TDEAction( i18n("Search by Bug &Number..."), "filefind", CTRL+TQt::Key_N, this,
TQT_SLOT( searchBugNumber() ), actionCollection(), "search_bugnumber" );
// For now "Description" searches by title. Maybe later we can have a
// full-text search interfacing bugs.trinitydesktop.org and rename the current one to "By Title".
- new TDEAction( i18n("Search by &Description...") ,"edit-find", CTRL+TQt::Key_D, TQT_TQOBJECT(this),
+ new TDEAction( i18n("Search by &Description...") ,"edit-find", CTRL+TQt::Key_D, this,
TQT_SLOT( searchDescription() ), actionCollection(), "search_description" );
-// new TDEAction( i18n("&Merge"), "view_remove", CTRL+TQt::Key_M, TQT_TQOBJECT(m_mainWidget),
+// new TDEAction( i18n("&Merge"), "view_remove", CTRL+TQt::Key_M, m_mainWidget,
// TQT_SLOT( mergeBugs() ), actionCollection(), "cmd_merge" );
-// new TDEAction( i18n("&Unmerge"), "view_top_bottom", CTRL+SHIFT+TQt::Key_M, TQT_TQOBJECT(m_mainWidget),
+// new TDEAction( i18n("&Unmerge"), "view_top_bottom", CTRL+SHIFT+TQt::Key_M, m_mainWidget,
// TQT_SLOT( unmergeBugs() ), actionCollection(), "cmd_unmerge" );
- new TDEAction( i18n("C&lose..."), "edittrash", CTRL+TQt::Key_L, TQT_TQOBJECT(m_mainWidget),
+ new TDEAction( i18n("C&lose..."), "edittrash", CTRL+TQt::Key_L, m_mainWidget,
TQT_SLOT( closeBug() ), actionCollection(), "cmd_close" );
-// new TDEAction( i18n("Clos&e Silently"), "edittrash", CTRL+TQt::Key_E, TQT_TQOBJECT(m_mainWidget),
+// new TDEAction( i18n("Clos&e Silently"), "edittrash", CTRL+TQt::Key_E, m_mainWidget,
// TQT_SLOT( closeBugSilently() ), actionCollection(), "cmd_close_silently" );
- new TDEAction( i18n("Re&open"), "idea", CTRL+TQt::Key_O, TQT_TQOBJECT(m_mainWidget),
+ new TDEAction( i18n("Re&open"), "idea", CTRL+TQt::Key_O, m_mainWidget,
TQT_SLOT( reopenBug() ), actionCollection(), "cmd_reopen" );
-// new TDEAction( i18n("Re&assign..."), "folder-new", CTRL+TQt::Key_A, TQT_TQOBJECT(m_mainWidget),
+// new TDEAction( i18n("Re&assign..."), "folder-new", CTRL+TQt::Key_A, m_mainWidget,
// TQT_SLOT( reassignBug() ), actionCollection(), "cmd_reassign" );
-// new TDEAction( i18n("Change &Title..."), "format-text-underline", CTRL+TQt::Key_T, TQT_TQOBJECT(m_mainWidget),
+// new TDEAction( i18n("Change &Title..."), "format-text-underline", CTRL+TQt::Key_T, m_mainWidget,
// TQT_SLOT( titleBug() ), actionCollection(), "cmd_title" );
-// new TDEAction( i18n("Change &Severity..."), "edit", CTRL+TQt::Key_S, TQT_TQOBJECT(m_mainWidget),
+// new TDEAction( i18n("Change &Severity..."), "edit", CTRL+TQt::Key_S, m_mainWidget,
// TQT_SLOT( severityBug() ), actionCollection(), "cmd_severity" );
- new TDEAction( i18n("&Reply..."), "mail-reply-all",CTRL+TQt::Key_R , TQT_TQOBJECT(m_mainWidget),
+ new TDEAction( i18n("&Reply..."), "mail-reply-all",CTRL+TQt::Key_R , m_mainWidget,
TQT_SLOT( replyBug() ), actionCollection(), "cmd_reply" );
- new TDEAction( i18n("Reply &Privately..."), "mail-reply-sender", CTRL+TQt::Key_I, TQT_TQOBJECT(m_mainWidget),
+ new TDEAction( i18n("Reply &Privately..."), "mail-reply-sender", CTRL+TQt::Key_I, m_mainWidget,
TQT_SLOT( replyPrivateBug() ), actionCollection(), "cmd_replyprivate" );
- KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() );
+ KStdAction::showMenubar(this, TQT_SLOT( slotToggleMenubar() ), actionCollection() );
#if KDE_IS_VERSION( 3, 1, 90 )
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
#endif
m_disconnectedAction = new TDEToggleAction( i18n("&Disconnected Mode"), 0,
- TQT_TQOBJECT(this),
+ this,
TQT_SLOT( slotDisconnectedAction() ),
actionCollection(),
"settings_disconnected" );
@@ -215,16 +215,16 @@ void KBBMainWindow::initActions()
m_pamBookmarks = new TDEActionMenu( i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" );
m_pBookmarkMenu = new KBookmarkMenu( KBBBookmarkManager::self(), this, m_pamBookmarks->popupMenu(), actionCollection(), true );
- KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(preferences()), actionCollection() );
+ KStdAction::preferences( this, TQT_SLOT(preferences()), actionCollection() );
- TDEToggleAction *toggleTmp = new TDEToggleAction( i18n("Show Closed Bugs"), "application-x-trash", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleDone() ),
+ TDEToggleAction *toggleTmp = new TDEToggleAction( i18n("Show Closed Bugs"), "application-x-trash", 0, this, TQT_SLOT( slotToggleDone() ),
actionCollection(), "cmd_toggle_done" );
#if KDE_IS_VERSION( 3, 2, 90 )
toggleTmp->setCheckedState(i18n("Hide Closed Bugs"));
#endif
toggleTmp->setChecked( KBBPrefs::instance()->mShowClosedBugs );
- toggleTmp =new TDEToggleAction( i18n("Show Wishes"), "bookmark", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleWishes() ),
+ toggleTmp =new TDEToggleAction( i18n("Show Wishes"), "bookmark", 0, this, TQT_SLOT( slotToggleWishes() ),
actionCollection(), "cmd_toggle_wishes" );
#if KDE_IS_VERSION( 3, 2, 90 )
toggleTmp->setCheckedState(i18n("Hide Wishes"));
@@ -232,7 +232,7 @@ void KBBMainWindow::initActions()
toggleTmp->setChecked(KBBPrefs::instance()->mShowWishes);
mSelectServerAction = new TDESelectAction( i18n( "Select Server" ), 0, 0,
- TQT_TQOBJECT(this),
+ this,
TQT_SLOT( slotSelectServer() ),
actionCollection(),
"select_server" );
@@ -240,10 +240,10 @@ void KBBMainWindow::initActions()
setupSelectServerAction();
if ( KBBPrefs::instance()->mDebugMode ) {
- new TDEAction( i18n("Show Last Server Response..."), 0 , TQT_TQOBJECT(this),
+ new TDEAction( i18n("Show Last Server Response..."), 0 , this,
TQT_SLOT( showLastResponse() ), actionCollection(),
"debug_lastresponse" );
- new TDEAction( i18n("Show Bug HTML Source..."), 0 , TQT_TQOBJECT(this),
+ new TDEAction( i18n("Show Bug HTML Source..."), 0 , this,
TQT_SLOT( showBugSource() ), actionCollection(),
"debug_showbugsource" );
}
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index 55027091..46dbfb9a 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -86,7 +86,7 @@ KompareShell::KompareShell()
m_mainViewDock = createDockWidget( "View", kapp->icon() );
// now that the Part is loaded, we cast it to a KomparePart to get
// our hands on it
- m_viewPart = static_cast<KomparePart*>(mainViewFactory->create(TQT_TQOBJECT(m_mainViewDock),
+ m_viewPart = static_cast<KomparePart*>(mainViewFactory->create(m_mainViewDock,
"kompare_part", "KParts::ReadWritePart" ));
if ( m_viewPart )
@@ -122,7 +122,7 @@ KompareShell::KompareShell()
{
m_navTreeDock = createDockWidget( "Navigation", kapp->icon() );
- m_navTreePart = static_cast<KompareNavTreePart*>(navTreeFactory->create(TQT_TQOBJECT(m_navTreeDock),
+ m_navTreePart = static_cast<KompareNavTreePart*>(navTreeFactory->create(m_navTreeDock,
"komparenavtreepart", "KParts::ReadOnlyPart" ));
if ( m_navTreePart )
@@ -171,9 +171,9 @@ KompareShell::KompareShell()
// Hook up the KomparePart -> KompareShell communication
connect( m_viewPart, TQT_SIGNAL( setStatusBarModelInfo( int, int, int, int, int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) );
+ this, TQT_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) );
connect( m_viewPart, TQT_SIGNAL( setStatusBarText(const TQString&) ),
- TQT_TQOBJECT(this), TQT_SLOT( slotSetStatusBarText(const TQString&) ) );
+ this, TQT_SLOT( slotSetStatusBarText(const TQString&) ) );
// Read basic main-view settings, and set to autosave
setAutoSaveSettings( "General Options" );
@@ -229,26 +229,26 @@ void KompareShell::blend( const KURL& url1, const KURL& diff )
void KompareShell::setupActions()
{
- TDEAction* open = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection());
+ TDEAction* open = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
open->setText( i18n( "&Open Diff..." ) );
new TDEAction( i18n("&Compare Files..."), "document-open", TQt::CTRL + TQt::Key_C,
- TQT_TQOBJECT(this), TQT_SLOT(slotFileCompareFiles()),
+ this, TQT_SLOT(slotFileCompareFiles()),
actionCollection(), "file_compare_files" );
new TDEAction( i18n("&Blend URL with Diff..."), "fileblend", TQt::CTRL + TQt::Key_B,
- TQT_TQOBJECT(this), TQT_SLOT(slotFileBlendURLAndDiff()),
+ this, TQT_SLOT(slotFileBlendURLAndDiff()),
actionCollection(), "file_blend_url" );
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose() ), actionCollection() );
+ KStdAction::quit( this, TQT_SLOT( slotFileClose() ), actionCollection() );
#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
createStandardStatusBarAction();
#endif
setStandardToolBarMenuEnabled(true);
- m_showTextView = new TDEToggleAction( i18n("Show T&ext View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTextView()),
+ m_showTextView = new TDEToggleAction( i18n("Show T&ext View"), 0, this, TQT_SLOT(slotShowTextView()),
actionCollection(), "options_show_text_view" );
m_showTextView->setCheckedState(i18n("Hide T&ext View"));
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+ KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
+ KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
}
void KompareShell::setupStatusBar()
@@ -439,14 +439,14 @@ void KompareShell::slotShowTextView()
m_textViewWidget = createDockWidget( i18n("Text View"), SmallIcon( "text") );
m_textViewPart = KParts::ComponentFactory::createPartInstanceFromQuery<KTextEditor::Document>(
TQString::fromLatin1("KTextEditor/Document"),
- TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0, TQStringList(), &errCode );
+ TQString(), this, 0, this, 0, TQStringList(), &errCode );
if ( m_textViewPart )
{
m_textView = m_textViewPart->createView( this, 0 );
- m_textViewWidget->setWidget( static_cast<TQWidget*>(m_textView) );
+ m_textViewWidget->setWidget( m_textView );
m_textEditIface = editInterface( m_textViewPart );
connect( m_viewPart, TQT_SIGNAL(diffString(const TQString&)),
- TQT_TQOBJECT(this), TQT_SLOT(slotSetDiffString(const TQString&)) );
+ this, TQT_SLOT(slotSetDiffString(const TQString&)) );
}
}
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index e5bd5fc8..1613897e 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -38,7 +38,7 @@
using namespace Diff2;
KompareNavTreePart::KompareNavTreePart( TQWidget* parent, const char* name )
- : KParts::ReadOnlyPart( TQT_TQOBJECT(parent), name ),
+ : KParts::ReadOnlyPart( parent, name ),
m_splitter( 0 ),
m_modelList( 0 ),
m_srcDirTree( 0 ),
diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp
index 5111346e..1e43bf82 100644
--- a/kompare/libdialogpages/diffpage.cpp
+++ b/kompare/libdialogpages/diffpage.cpp
@@ -160,7 +160,7 @@ void DiffPage::setDefaults()
void DiffPage::slotShowRegExpEditor()
{
if ( ! m_ignoreRegExpDialog )
- m_ignoreRegExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+ m_ignoreRegExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( m_ignoreRegExpDialog->tqt_cast( "KRegExpEditorInterface" ) );
diff --git a/kspy/spy.cpp b/kspy/spy.cpp
index 24ebaf4f..6911c269 100644
--- a/kspy/spy.cpp
+++ b/kspy/spy.cpp
@@ -92,10 +92,10 @@ Spy::~Spy()
void Spy::setTarget( TQWidget *target )
{
mTarget = target;
- mPropsView->buildList( TQT_TQOBJECT(mTarget) );
- mSigSlotView->buildList( TQT_TQOBJECT(mTarget) );
- mReceiversView->buildList( TQT_TQOBJECT(mTarget) );
- mClassInfoView->buildList( TQT_TQOBJECT(mTarget) );
+ mPropsView->buildList( mTarget );
+ mSigSlotView->buildList( mTarget );
+ mReceiversView->buildList( mTarget );
+ mClassInfoView->buildList( mTarget );
}
void Spy::keyPressEvent( TQKeyEvent *event )
diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp
index 430afaa0..00230f2a 100644
--- a/kuiviewer/kuiviewer.cpp
+++ b/kuiviewer/kuiviewer.cpp
@@ -60,7 +60,7 @@ KUIViewer::KUIViewer()
{
// now that the Part is loaded, we cast it to a Part to get
// our hands on it
- m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this),
+ m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this,
"kuiviewer_part", "KParts::ReadOnlyPart" ));
if (m_part)
@@ -97,8 +97,8 @@ void KUIViewer::load(const KURL& url)
void KUIViewer::setupActions()
{
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+ KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
+ KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
}
void KUIViewer::saveProperties(TDEConfig* /*config*/)
diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp
index d2952577..c59e4c12 100644
--- a/kuiviewer/kuiviewer_part.cpp
+++ b/kuiviewer/kuiviewer_part.cpp
@@ -72,7 +72,7 @@ KUIViewerPart::KUIViewerPart( TQWidget *parentWidget, const char *widgetName,
m_style = new TDEListAction( i18n("Style"),
CTRL + Key_S,
- TQT_TQOBJECT(this),
+ this,
TQT_SLOT(slotStyle(int)),
actionCollection(),
"change_style");
@@ -187,7 +187,7 @@ void KUIViewerPart::slotStyle(int)
TQObjectList *l = m_widget->queryList( "TQWidget" );
for ( TQObject *o = l->first(); o; o = l->next() )
- ( TQT_TQWIDGET(o) )->setStyle( style );
+ ( static_cast<TQWidget*>(o) )->setStyle( style );
delete l;
m_widget->show();
diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp
index 5c5e2579..2d904af9 100644
--- a/scheck/scheck.cpp
+++ b/scheck/scheck.cpp
@@ -909,7 +909,7 @@ void StyleCheckStyle::accelManageRecursive(TQWidget* widget)
while ((walk = iter.current()))
{
if (walk->isWidgetType())
- accelManageRecursive(TQT_TQWIDGET(walk));
+ accelManageRecursive(static_cast<TQWidget*>(walk));
++iter;
}
}
@@ -2637,7 +2637,7 @@ bool StyleCheckStyle::objectEventHandler( const TQStyleControlElementData &ceDat
if ( event->type() == TQEvent::Paint && object->inherits("TQLabel") )
{
- TQLabel* lb = static_cast<TQLabel*>(TQT_TQWIDGET(object));
+ TQLabel* lb = static_cast<TQLabel*>(object);
if (lb->pixmap() || lb->picture() || lb->movie() || (lb->textFormat() == TQt::RichText) ||
(lb->textFormat() == TQt::AutoText && TQStyleSheet::mightBeRichText(lb->text())) )
{
@@ -2702,12 +2702,12 @@ bool StyleCheckStyle::objectEventHandler( const TQStyleControlElementData &ceDat
if ( event->type() == TQEvent::Paint && object->inherits("TQGroupBox") )
{
TQPaintEvent * pevent = static_cast<TQPaintEvent*>(event);
- TQGroupBox* gb = static_cast<TQGroupBox*>(TQT_TQWIDGET(object));
+ TQGroupBox* gb = static_cast<TQGroupBox*>(object);
bool nestedGroupBox = false;
TQString stripped_title = removedXX(stripAccelViolations(gb->title()));
//Walk parent hierarchy to check whether any are groupboxes too..
- TQObject* parent = TQT_TQOBJECT(gb);
+ TQObject* parent = gb;
// GCC suggested parentheses around assignment used as truth value
// I suggested that it could eat me. GCC won.
diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp
index bf87b28a..76d62260 100644
--- a/tdecachegrind/tdecachegrind/callgraphview.cpp
+++ b/tdecachegrind/tdecachegrind/callgraphview.cpp
@@ -1846,7 +1846,7 @@ void CallGraphView::refresh()
_exporter.reset(_data, _activeItem, _costType, _groupType);
_exporter.writeDot();
- _renderProcess = new TQProcess(TQT_TQOBJECT(this));
+ _renderProcess = new TQProcess(this);
if (_layout == GraphOptions::Circular)
_renderProcess->addArgument( "twopi" );
else
diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp
index b9675a0e..03680b83 100644
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@@ -83,16 +83,16 @@ TopLevel::TopLevel(const char *name)
_functionDockShown->setChecked(!_functionDock->isHidden());
connect(_partDock, TQT_SIGNAL(visibilityChanged(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(partVisibilityChanged(bool)));
+ this, TQT_SLOT(partVisibilityChanged(bool)));
connect(_stackDock, TQT_SIGNAL(visibilityChanged(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(stackVisibilityChanged(bool)));
+ this, TQT_SLOT(stackVisibilityChanged(bool)));
connect(_functionDock, TQT_SIGNAL(visibilityChanged(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(functionVisibilityChanged(bool)));
+ this, TQT_SLOT(functionVisibilityChanged(bool)));
#if ENABLE_DUMPDOCK
_dumpDockShown->setChecked(!_dumpDock->isHidden());
connect(_dumpDock, TQT_SIGNAL(visibilityChanged(bool)),
- TQT_TQOBJECT(this), TQT_SLOT(dumpVisibilityChanged(bool)));
+ this, TQT_SLOT(dumpVisibilityChanged(bool)));
#endif
_statusbar = statusBar();
@@ -134,7 +134,7 @@ TopLevel::TopLevel(const char *name)
// if this is the first toplevel, show tip of day
if (memberList->count() == 1)
- TQTimer::singleShot( 200, TQT_TQOBJECT(this), TQT_SLOT(slotShowTipOnStart()) );
+ TQTimer::singleShot( 200, this, TQT_SLOT(slotShowTipOnStart()) );
}
void TopLevel::init()
@@ -174,19 +174,19 @@ void TopLevel::setupPartSelection(PartSelection* ps)
// setup connections from the part selection widget
connect(ps, TQT_SIGNAL(activePartsChanged(const TracePartList&)),
- TQT_TQOBJECT(this), TQT_SLOT(activePartsChangedSlot(const TracePartList&)));
+ this, TQT_SLOT(activePartsChangedSlot(const TracePartList&)));
connect(ps, TQT_SIGNAL(groupChanged(TraceCostItem*)),
- TQT_TQOBJECT(this), TQT_SLOT(setGroupDelayed(TraceCostItem*)));
+ this, TQT_SLOT(setGroupDelayed(TraceCostItem*)));
connect(ps, TQT_SIGNAL(functionChanged(TraceItem*)),
- TQT_TQOBJECT(this), TQT_SLOT(setTraceItemDelayed(TraceItem*)));
+ this, TQT_SLOT(setTraceItemDelayed(TraceItem*)));
connect(ps, TQT_SIGNAL(goBack()),
_stackSelection, TQT_SLOT(browserBack()));
connect(ps, TQT_SIGNAL(partsHideSelected()),
- TQT_TQOBJECT(this), TQT_SLOT(partsHideSelectedSlotDelayed()));
+ this, TQT_SLOT(partsHideSelectedSlotDelayed()));
connect(ps, TQT_SIGNAL(partsUnhideAll()),
- TQT_TQOBJECT(this), TQT_SLOT(partsUnhideAllSlotDelayed()));
+ this, TQT_SLOT(partsUnhideAllSlotDelayed()));
connect(ps, TQT_SIGNAL(showMessage(const TQString&, int)),
_statusbar, TQT_SLOT(message(const TQString&, int)));
@@ -322,7 +322,7 @@ void TopLevel::createDocks()
"above.</p>"));
connect(_stackSelection, TQT_SIGNAL(functionSelected(TraceItem*)),
- TQT_TQOBJECT(this), TQT_SLOT(setTraceItemDelayed(TraceItem*)));
+ this, TQT_SLOT(setTraceItemDelayed(TraceItem*)));
_functionDock = new TQDockWindow(TQDockWindow::InDock, this);
_functionDock->setCaption(i18n("Flat Profile"));
@@ -416,7 +416,7 @@ void TopLevel::createDocks()
setAppropriate(_functionDock, true);
connect( _partDock, TQT_SIGNAL(contextMenuRequested(const TQPoint &)),
- TQT_TQOBJECT(this), TQT_SLOT(showDockMenu(const TQPoint &)));
+ this, TQT_SLOT(showDockMenu(const TQPoint &)));
#endif
}
@@ -449,14 +449,14 @@ void TopLevel::createLayoutActions()
action = new TDEAction( i18n( "&Duplicate" ),
TDEShortcut(KKey("Ctrl+Plus")),
- TQT_TQOBJECT(this), TQT_SLOT(layoutDuplicate()),
+ this, TQT_SLOT(layoutDuplicate()),
actionCollection(), "layout_duplicate" );
hint = i18n("<b>Duplicate Current Layout</b>"
"<p>Make a copy of the current layout.</p>");
action->setWhatsThis( hint );
action = new TDEAction( i18n( "&Remove" ), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(layoutRemove()),
+ this, TQT_SLOT(layoutRemove()),
actionCollection(), "layout_remove" );
hint = i18n("<b>Remove Current Layout</b>"
"<p>Delete current layout and make the previous active.</p>");
@@ -464,26 +464,26 @@ void TopLevel::createLayoutActions()
action = new TDEAction( i18n( "&Go to Next" ),
TDEShortcut(KKey("Ctrl+Right")),
- TQT_TQOBJECT(this), TQT_SLOT(layoutNext()),
+ this, TQT_SLOT(layoutNext()),
actionCollection(), "layout_next" );
hint = i18n("Go to Next Layout");
action->setWhatsThis( hint );
action = new TDEAction( i18n( "&Go to Previous" ),
TDEShortcut(KKey("Ctrl+Left")),
- TQT_TQOBJECT(this), TQT_SLOT(layoutPrevious()),
+ this, TQT_SLOT(layoutPrevious()),
actionCollection(), "layout_previous" );
hint = i18n("Go to Previous Layout");
action->setWhatsThis( hint );
action = new TDEAction( i18n( "&Restore to Default" ), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(layoutRestore()),
+ this, TQT_SLOT(layoutRestore()),
actionCollection(), "layout_restore" );
hint = i18n("Restore Layouts to Default");
action->setWhatsThis( hint );
action = new TDEAction( i18n( "&Save as Default" ), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(layoutSave()),
+ this, TQT_SLOT(layoutSave()),
actionCollection(), "layout_save" );
hint = i18n("Save Layouts as Default");
action->setWhatsThis( hint );
@@ -495,12 +495,12 @@ void TopLevel::createMiscActions()
TQString hint;
TDEAction* action;
- action = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection());
+ action = KStdAction::openNew(this, TQT_SLOT(newWindow()), actionCollection());
hint = i18n("<b>New</b><p>Open new empty KCachegrind window.</p>");
action->setWhatsThis( hint );
action = new TDEAction( i18n( "&Add..." ), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(addTrace()),
+ this, TQT_SLOT(addTrace()),
actionCollection(), "file_add" );
hint = i18n("<b>Add Profile Data</b>"
"<p>This opens an additional profile data file in the current window.</p>");
@@ -513,13 +513,13 @@ void TopLevel::createMiscActions()
#else
TDEStdAccel::key(TDEStdAccel::Reload),
#endif
- TQT_TQOBJECT(this), TQT_SLOT( reload() ), actionCollection(), "reload" );
+ this, TQT_SLOT( reload() ), actionCollection(), "reload" );
hint = i18n("<b>Reload Profile Data</b>"
"<p>This loads any new created parts, too.</p>");
action->setWhatsThis( hint );
action = new TDEAction( i18n( "&Export Graph" ), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(exportGraph()),
+ this, TQT_SLOT(exportGraph()),
actionCollection(), "export" );
hint = i18n("<b>Export Call Graph</b>"
@@ -535,7 +535,7 @@ void TopLevel::createMiscActions()
#else
TDEStdAccel::key(TDEStdAccel::Redo),
#endif
- TQT_TQOBJECT(this), TQT_SLOT( forceTrace() ),
+ this, TQT_SLOT( forceTrace() ),
actionCollection(), "dump" );
hint = i18n("<b>Force Dump</b>"
"<p>This forces a dump for a Callgrind profile run "
@@ -561,20 +561,20 @@ void TopLevel::createMiscActions()
"of the program.</p>");
_taDump->setWhatsThis( hint );
- action = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(loadTrace()), actionCollection());
+ action = KStdAction::open(this, TQT_SLOT(loadTrace()), actionCollection());
hint = i18n("<b>Open Profile Data</b>"
"<p>This opens a profile data file, with possible multiple parts</p>");
action->setToolTip( hint );
action->setWhatsThis( hint );
- _openRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(loadTrace(const KURL&)),
+ _openRecent = KStdAction::openRecent(this, TQT_SLOT(loadTrace(const KURL&)),
actionCollection());
- KStdAction::showStatusbar(TQT_TQOBJECT(this),
+ KStdAction::showStatusbar(this,
TQT_SLOT(toggleStatusBar()), actionCollection());
_partDockShown = new TDEToggleAction(i18n("Parts Overview"), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(togglePartDock()),
+ this, TQT_SLOT(togglePartDock()),
actionCollection(),
"settings_show_partdock");
@@ -583,7 +583,7 @@ void TopLevel::createMiscActions()
_partDockShown->setWhatsThis( hint );
_stackDockShown = new TDEToggleAction(i18n("Call Stack"), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(toggleStackDock()),
+ this, TQT_SLOT(toggleStackDock()),
actionCollection(),
"settings_show_stackdock");
@@ -592,7 +592,7 @@ void TopLevel::createMiscActions()
_stackDockShown->setWhatsThis( hint );
_functionDockShown = new TDEToggleAction(i18n("Function Profile"), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(toggleFunctionDock()),
+ this, TQT_SLOT(toggleFunctionDock()),
actionCollection(),
"settings_show_profiledock");
@@ -602,7 +602,7 @@ void TopLevel::createMiscActions()
#if ENABLE_DUMPDOCK
_dumpDockShown = new TDEToggleAction(i18n("Profile Dumps"), TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(toggleDumpDock()),
+ this, TQT_SLOT(toggleDumpDock()),
actionCollection(),
"settings_show_dumpdock");
@@ -613,7 +613,7 @@ void TopLevel::createMiscActions()
_taPercentage = new TDEToggleAction(i18n("Show Relative Costs"), "percent",
TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(togglePercentage()),
+ this, TQT_SLOT(togglePercentage()),
actionCollection(),
"view_percentage");
#if TDE_VERSION >= 0x030290
@@ -627,7 +627,7 @@ void TopLevel::createMiscActions()
_taExpanded = new TDEToggleAction(i18n("Percentage Relative to Parent"), "move",
TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(toggleExpanded()),
+ this, TQT_SLOT(toggleExpanded()),
actionCollection(),
"view_expanded");
@@ -652,7 +652,7 @@ void TopLevel::createMiscActions()
_taCycles = new TDEToggleAction( i18n( "Do Cycle Detection" ), "edit-undo",
TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT( toggleCycles() ), actionCollection(),
+ this, TQT_SLOT( toggleCycles() ), actionCollection(),
"view_cycles" );
#if TDE_VERSION >= 0x030290
// for KDE 3.3: show another text instead of a checkmark
@@ -673,10 +673,10 @@ void TopLevel::createMiscActions()
"is the option to switch this off.");
_taCycles->setWhatsThis( hint );
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection());
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this),TQT_SLOT(configureToolbars()),
+ KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+ KStdAction::preferences(this, TQT_SLOT(configure()), actionCollection());
+ KStdAction::keyBindings(this, TQT_SLOT(configureKeys()), actionCollection());
+ KStdAction::configureToolbars(this,TQT_SLOT(configureToolbars()),
actionCollection());
#if 0
action = KStdAction::back(_stackSelection, TQT_SLOT(browserBack()),
@@ -701,12 +701,12 @@ void TopLevel::createMiscActions()
#else
_paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "go-up",
ALT+Key_Up,
- TQT_TQOBJECT(_stackSelection), TQT_SLOT( browserUp() ),
+ _stackSelection, TQT_SLOT( browserUp() ),
actionCollection(), "go_up" );
connect( _paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ),
- TQT_TQOBJECT(this), TQT_SLOT( upAboutToShow() ) );
+ this, TQT_SLOT( upAboutToShow() ) );
connect( _paUp->popupMenu(), TQT_SIGNAL( activated( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( upActivated( int ) ) );
+ this, TQT_SLOT( upActivated( int ) ) );
hint = i18n("<b>Go Up</b>"
"<p>Go to last selected caller of current function. "
"If no caller was visited, use that with highest cost.</p>");
@@ -715,18 +715,18 @@ void TopLevel::createMiscActions()
TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
_paBack = new TDEToolBarPopupAction( backForward.first, ALT+Key_Left,
- TQT_TQOBJECT(_stackSelection), TQT_SLOT(browserBack()),
+ _stackSelection, TQT_SLOT(browserBack()),
actionCollection(), "go_back" );
connect( _paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ),
- TQT_TQOBJECT(this), TQT_SLOT( backAboutToShow() ) );
+ this, TQT_SLOT( backAboutToShow() ) );
connect( _paBack->popupMenu(), TQT_SIGNAL( activated( int ) ),
- TQT_TQOBJECT(this), TQT_SLOT( backActivated( int ) ) );
+ this, TQT_SLOT( backActivated( int ) ) );
hint = i18n("Go back in function selection history");
_paBack->setToolTip( hint );
_paBack->setWhatsThis( hint );
_paForward = new TDEToolBarPopupAction( backForward.second, ALT+Key_Right,
- TQT_TQOBJECT(_stackSelection),
+ _stackSelection,
TQT_SLOT(browserForward()),
actionCollection(), "go_forward" );
connect( _paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ),
@@ -748,7 +748,7 @@ void TopLevel::createMiscActions()
// cost types are dependent on loaded data, thus TDESelectAction
// is filled in setData()
connect( _saCost, TQT_SIGNAL(activated(const TQString&)),
- TQT_TQOBJECT(this), TQT_SLOT(costTypeSelected(const TQString&)));
+ this, TQT_SLOT(costTypeSelected(const TQString&)));
_saCost2 = new TDESelectAction( i18n("Secondary Event Type"), TDEShortcut(),
actionCollection(), "view_cost_type2");
@@ -758,7 +758,7 @@ void TopLevel::createMiscActions()
_saCost2->setWhatsThis( hint );
connect( _saCost2, TQT_SIGNAL(activated(const TQString&)),
- TQT_TQOBJECT(this), TQT_SLOT(costType2Selected(const TQString&)));
+ this, TQT_SLOT(costType2Selected(const TQString&)));
saGroup = new TDESelectAction( i18n("Grouping"), TDEShortcut(),
actionCollection(), "view_group_type");
@@ -777,10 +777,10 @@ void TopLevel::createMiscActions()
saGroup->setItems(args);
connect( saGroup, TQT_SIGNAL(activated(int)),
- TQT_TQOBJECT(this), TQT_SLOT(groupTypeSelected(int)));
+ this, TQT_SLOT(groupTypeSelected(int)));
_taSplit = new TDEToggleAction(i18n("Split"), "view_left_right", TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(splitSlot()),
+ this, TQT_SLOT(splitSlot()),
actionCollection(), "view_split");
hint = i18n("Show two information panels");
@@ -789,7 +789,7 @@ void TopLevel::createMiscActions()
_taSplitDir = new TDEToggleAction(i18n("Split Horizontal"),
"view_left_right", TDEShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT(splitDirSlot()),
+ this, TQT_SLOT(splitDirSlot()),
actionCollection(), "view_split_dir");
hint = i18n("Change Split Orientation when main window is split.");
@@ -798,11 +798,11 @@ void TopLevel::createMiscActions()
// copied from KMail...
#if TDE_VERSION >= 308 // KDE 3.1
- KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() );
+ KStdAction::tipOfDay( this, TQT_SLOT( slotShowTip() ), actionCollection() );
#else
(void) new TDEAction( KGuiItem( i18n("Tip of the &Day..."), "idea",
i18n("Show \"Tip of the Day\"") ),
- 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTip()),
+ 0, this, TQT_SLOT(slotShowTip()),
actionCollection(), "help_show_tip" );
#endif
}
@@ -1102,7 +1102,7 @@ void TopLevel::addTrace(TQString file)
void TopLevel::loadDelayed(TQString file)
{
_loadTraceDelayed = file;
- TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(loadTraceDelayed()));
+ TQTimer::singleShot(0, this, TQT_SLOT(loadTraceDelayed()));
}
void TopLevel::loadTraceDelayed()
@@ -1381,13 +1381,13 @@ bool TopLevel::setFunction(TraceFunction* f)
void TopLevel::setCostTypeDelayed(TraceCostType* ct)
{
_costTypeDelayed = ct;
- TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setCostTypeDelayed()));
+ TQTimer::singleShot (0, this, TQT_SLOT(setCostTypeDelayed()));
}
void TopLevel::setCostType2Delayed(TraceCostType* ct)
{
_costType2Delayed = ct;
- TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setCostType2Delayed()));
+ TQTimer::singleShot (0, this, TQT_SLOT(setCostType2Delayed()));
}
void TopLevel::setCostTypeDelayed()
@@ -1403,7 +1403,7 @@ void TopLevel::setCostType2Delayed()
void TopLevel::setGroupTypeDelayed(TraceItem::CostType gt)
{
_groupTypeDelayed = gt;
- TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setGroupTypeDelayed()));
+ TQTimer::singleShot (0, this, TQT_SLOT(setGroupTypeDelayed()));
}
void TopLevel::setGroupTypeDelayed()
@@ -1420,7 +1420,7 @@ void TopLevel::setGroupDelayed(TraceCostItem* g)
#endif
_groupDelayed = g;
- TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setGroupDelayed()));
+ TQTimer::singleShot (0, this, TQT_SLOT(setGroupDelayed()));
}
void TopLevel::setGroupDelayed()
@@ -1431,7 +1431,7 @@ void TopLevel::setGroupDelayed()
void TopLevel::setDirectionDelayed(TraceItemView::Direction d)
{
_directionDelayed = d;
- TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setDirectionDelayed()));
+ TQTimer::singleShot (0, this, TQT_SLOT(setDirectionDelayed()));
}
void TopLevel::setDirectionDelayed()
@@ -1479,7 +1479,7 @@ void TopLevel::setTraceItemDelayed(TraceItem* i)
_lastSender ? _lastSender->name() :"0" );
#endif
- TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setTraceItemDelayed()));
+ TQTimer::singleShot (0, this, TQT_SLOT(setTraceItemDelayed()));
}
void TopLevel::setTraceItemDelayed()
@@ -1652,10 +1652,10 @@ void TopLevel::addCostMenu(TQPopupMenu* popup, bool withCost2)
}
if (_showPercentage)
popup->insertItem(i18n("Show Absolute Cost"),
- TQT_TQOBJECT(this), TQT_SLOT(setAbsoluteCost()));
+ this, TQT_SLOT(setAbsoluteCost()));
else
popup->insertItem(i18n("Show Relative Cost"),
- TQT_TQOBJECT(this), TQT_SLOT(setRelativeCost()));
+ this, TQT_SLOT(setRelativeCost()));
}
bool TopLevel::setCostType(int id)
@@ -1684,9 +1684,9 @@ bool TopLevel::setCostType2(int id)
void TopLevel::addGoMenu(TQPopupMenu* popup)
{
- popup->insertItem(i18n("Go Back"), TQT_TQOBJECT(this), TQT_SLOT(goBack()));
- popup->insertItem(i18n("Go Forward"), TQT_TQOBJECT(this), TQT_SLOT(goForward()));
- popup->insertItem(i18n("Go Up"), TQT_TQOBJECT(this), TQT_SLOT(goUp()));
+ popup->insertItem(i18n("Go Back"), this, TQT_SLOT(goBack()));
+ popup->insertItem(i18n("Go Forward"), this, TQT_SLOT(goForward()));
+ popup->insertItem(i18n("Go Up"), this, TQT_SLOT(goUp()));
}
void TopLevel::goBack()
@@ -2098,7 +2098,7 @@ void TopLevel::activePartsChangedSlot(const TracePartList& list)
void TopLevel::partsHideSelectedSlotDelayed()
{
- TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(partsHideSelectedSlot()) );
+ TQTimer::singleShot( 0, this, TQT_SLOT(partsHideSelectedSlot()) );
}
// this puts selected parts into hidden list,
@@ -2131,7 +2131,7 @@ void TopLevel::partsHideSelectedSlot()
void TopLevel::partsUnhideAllSlotDelayed()
{
- TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(partsUnhideAllSlot()) );
+ TQTimer::singleShot( 0, this, TQT_SLOT(partsUnhideAllSlot()) );
}
// this unhides all hidden parts. Does NOT change selection
@@ -2159,7 +2159,7 @@ void TopLevel::forceTrace()
cmd.close();
}
if (_taDump->isChecked())
- TQTimer::singleShot( 1000, TQT_TQOBJECT(this), TQT_SLOT(forceTraceReload()) );
+ TQTimer::singleShot( 1000, this, TQT_SLOT(forceTraceReload()) );
else {
// cancel request
cmd.remove();
@@ -2174,7 +2174,7 @@ void TopLevel::forceTraceReload()
TQFile cmd("callgrind.cmd");
if (cmd.exists()) {
if (_taDump->isChecked())
- TQTimer::singleShot( 1000, TQT_TQOBJECT(this), TQT_SLOT(forceTraceReload()) );
+ TQTimer::singleShot( 1000, this, TQT_SLOT(forceTraceReload()) );
return;
}
_taDump->setChecked(false);
diff --git a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp
index 26098adb..9168dc36 100644
--- a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp
+++ b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp
@@ -48,7 +48,7 @@
SvnHelper::SvnHelper():TDEApplication() {
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
- KWinModule wm ( TQT_TQOBJECT(this) );
+ KWinModule wm ( this );
m_id = wm.activeWindow();
KURL::List list;
diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp
index aa0e1683..c0ef19e5 100644
--- a/umbrello/umbrello/associationwidget.cpp
+++ b/umbrello/umbrello/associationwidget.cpp
@@ -2253,7 +2253,7 @@ void AssociationWidget::mouseReleaseEvent(TQMouseEvent * me) {
}//end method mouseReleaseEvent
bool AssociationWidget::showDialog() {
- AssocPropDlg dlg(static_cast<TQWidget*>(m_pView), this );
+ AssocPropDlg dlg(m_pView, this );
if (! dlg.exec())
return false;
TQString name = getName();
diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp
index 9262949e..f3036a94 100644
--- a/umbrello/umbrello/dialogs/activitypage.cpp
+++ b/umbrello/umbrello/dialogs/activitypage.cpp
@@ -69,10 +69,10 @@ void ActivityPage::setupPage() {
KButtonBox* buttonBox = new KButtonBox(m_pActivityGB);
- buttonBox->addButton( i18n("New Activity..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewActivity()) );
+ buttonBox->addButton( i18n("New Activity..."), this, TQT_SLOT(slotNewActivity()) );
m_pDeleteActivityButton = buttonBox->addButton( i18n("Delete"),
- TQT_TQOBJECT(this), TQT_SLOT(slotDelete()) );
- m_pRenameButton = buttonBox->addButton( i18n("Rename"), TQT_TQOBJECT(this), TQT_SLOT(slotRename()) );
+ this, TQT_SLOT(slotDelete()) );
+ m_pRenameButton = buttonBox->addButton( i18n("Rename"), this, TQT_SLOT(slotRename()) );
listVBoxLayout->addWidget(buttonBox);
mainLayout -> addWidget( m_pActivityGB );
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp
index b4028f18..a86273a5 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.cpp
+++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp
@@ -95,10 +95,10 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi
//the action buttons
KButtonBox* buttonBox = new KButtonBox(m_pItemListGB);
- buttonBox->addButton( newItemType, TQT_TQOBJECT(this), TQT_SLOT(slotNewListItem()) );
+ buttonBox->addButton( newItemType, this, TQT_SLOT(slotNewListItem()) );
m_pDeleteListItemButton = buttonBox->addButton( i18n("&Delete"),
- TQT_TQOBJECT(this), TQT_SLOT(slotDelete()) );
- m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()) );
+ this, TQT_SLOT(slotDelete()) );
+ m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, TQT_SLOT(slotProperties()) );
listVBoxLayout->addWidget(buttonBox);
mainLayout->addWidget(m_pItemListGB);
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp
index 76b224c0..cedee6b6 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.cpp
+++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp
@@ -138,9 +138,9 @@ void UMLOperationDialog::setupDialog() {
buttonLayout->addWidget( m_pDownButton );
KButtonBox* buttonBox = new KButtonBox(m_pParmsGB);
- buttonBox->addButton( i18n("Ne&w Parameter..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewParameter()) );
- m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteParameter()) );
- m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), TQT_TQOBJECT(this),
+ buttonBox->addButton( i18n("Ne&w Parameter..."), this, TQT_SLOT(slotNewParameter()) );
+ m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), this, TQT_SLOT(slotDeleteParameter()) );
+ m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this,
TQT_SLOT(slotParameterProperties()) );
parmsLayout->addWidget(buttonBox);
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index a4feb485..961a66d5 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -160,43 +160,43 @@ UMLApp* UMLApp::app()
}
void UMLApp::initActions() {
- fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection());
- fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection());
- fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
- fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
- fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection());
- fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection());
- filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection());
- fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection());
- editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotEditUndo()), actionCollection());
- editRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotEditRedo()), actionCollection());
- editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection());
- editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection());
- editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection());
+ fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection());
+ fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
+ fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
+ fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection());
+ fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection());
+ fileClose = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection());
+ filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
+ fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
+ editUndo = KStdAction::undo(this, TQT_SLOT(slotEditUndo()), actionCollection());
+ editRedo = KStdAction::redo(this, TQT_SLOT(slotEditRedo()), actionCollection());
+ editCut = KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection());
+ editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection());
+ editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection());
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
- selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), actionCollection());
+ selectAll = KStdAction::selectAll(this, TQT_SLOT( slotSelectAll() ), actionCollection());
fileExportDocbook = new TDEAction(i18n("&Export model to DocBook"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotFileExportDocbook() ),
+ this, TQT_SLOT( slotFileExportDocbook() ),
actionCollection(), "file_export_docbook");
fileExportXhtml = new TDEAction(i18n("&Export model to XHTML"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotFileExportXhtml() ),
+ this, TQT_SLOT( slotFileExportXhtml() ),
actionCollection(), "file_export_xhtml");
- classWizard = new TDEAction(i18n("&New Class Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(slotClassWizard()),
+ classWizard = new TDEAction(i18n("&New Class Wizard..."),0,this,TQT_SLOT(slotClassWizard()),
actionCollection(),"class_wizard");
- new TDEAction(i18n("&Add Default Datatypes for Active Language"), 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&Add Default Datatypes for Active Language"), 0, this,
TQT_SLOT(slotAddDefaultDatatypes()), actionCollection(), "create_default_datatypes");
- preferences = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotPrefs() ), actionCollection());
+ preferences = KStdAction::preferences(this, TQT_SLOT( slotPrefs() ), actionCollection());
- genWizard = new TDEAction(i18n("&Code Generation Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(generationWizard()),
+ genWizard = new TDEAction(i18n("&Code Generation Wizard..."),0,this,TQT_SLOT(generationWizard()),
actionCollection(),"generation_wizard");
- genAll = new TDEAction(i18n("&Generate All Code"),0,TQT_TQOBJECT(this),TQT_SLOT(generateAllCode()),
+ genAll = new TDEAction(i18n("&Generate All Code"),0,this,TQT_SLOT(generateAllCode()),
actionCollection(),"generate_all");
importClasses = new TDEAction(i18n("&Import Classes..."), SmallIconSet("text-x-c++src"), 0,
- TQT_TQOBJECT(this),TQT_SLOT(slotImportClasses()), actionCollection(),"import_class");
+ this,TQT_SLOT(slotImportClasses()), actionCollection(),"import_class");
fileNew->setToolTip(i18n("Creates a new document"));
fileOpen->setToolTip(i18n("Opens an existing document"));
@@ -215,63 +215,63 @@ void UMLApp::initActions() {
deleteSelectedWidget = new TDEAction( i18n("Delete &Selected"),
SmallIconSet("edit-delete"),
- TDEShortcut(TQt::Key_Delete), TQT_TQOBJECT(this),
+ TDEShortcut(TQt::Key_Delete), this,
TQT_SLOT( slotDeleteSelectedWidget() ), actionCollection(),
"delete_selected" );
// The different views
newDiagram = new TDEActionMenu(0, SmallIconSet("document-new"), actionCollection(), "new_view");
classDiagram = new TDEAction( i18n( "&Class Diagram..." ), SmallIconSet("umbrello_diagram_class"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" );
+ this, TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" );
#if defined (HAVE_DOT)
- autolayout = new TDEAction(i18n("&Autolayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutolayout()),
+ autolayout = new TDEAction(i18n("&Autolayout..."),0,0,this,TQT_SLOT(slotAutolayout()),
actionCollection(),"autolayout");
#endif
sequenceDiagram= new TDEAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" );
+ this, TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" );
collaborationDiagram = new TDEAction( i18n( "C&ollaboration Diagram..." ), SmallIconSet("umbrello_diagram_collaboration"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" );
+ this, TQT_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" );
useCaseDiagram= new TDEAction( i18n( "&Use Case Diagram..." ), SmallIconSet("umbrello_diagram_usecase"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" );
+ this, TQT_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" );
stateDiagram= new TDEAction( i18n( "S&tate Diagram..." ), SmallIconSet("umbrello_diagram_state"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" );
+ this, TQT_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" );
activityDiagram= new TDEAction( i18n( "&Activity Diagram..." ), SmallIconSet("umbrello_diagram_activity"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" );
+ this, TQT_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" );
componentDiagram = new TDEAction( i18n("Co&mponent Diagram..."), SmallIconSet("umbrello_diagram_component"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotComponentDiagram() ), actionCollection(),
+ this, TQT_SLOT( slotComponentDiagram() ), actionCollection(),
"new_component_diagram" );
deploymentDiagram = new TDEAction( i18n("&Deployment Diagram..."), SmallIconSet("umbrello_diagram_deployment"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotDeploymentDiagram() ), actionCollection(),
+ this, TQT_SLOT( slotDeploymentDiagram() ), actionCollection(),
"new_deployment_diagram" );
entityRelationshipDiagram = new TDEAction( i18n("&Entity Relationship Diagram..."), SmallIconSet("umbrello_diagram_entityrelationship"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(),
+ this, TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(),
"new_entityrelationship_diagram" );
viewClearDiagram = new TDEAction(i18n("&Clear Diagram"), SmallIconSet("edit-clear"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram");
+ this, TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram");
viewSnapToGrid = new TDEToggleAction(i18n("&Snap to Grid"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid");
+ this, TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid");
viewShowGrid = new TDEToggleAction(i18n("S&how Grid"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid");
+ this, TQT_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid");
#if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
viewShowGrid->setCheckedState(i18n("&Hide Grid"));
#endif
deleteDiagram = new TDEAction(i18n("&Delete"), SmallIconSet("edit-delete"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete");
+ this, TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete");
viewExportImage = new TDEAction(i18n("&Export as Picture..."), SmallIconSet("image-x-generic"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image");
+ this, TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image");
viewExportImageAll = new TDEAction(i18n("Export &All Diagrams as Pictures..."), SmallIconSet("image-x-generic"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all");
+ this, TQT_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all");
viewProperties = new TDEAction(i18n("&Properties"), SmallIconSet("application-vnd.tde.info"), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewProperties() ), actionCollection(), "view_properties");
+ this, TQT_SLOT( slotCurrentViewProperties() ), actionCollection(), "view_properties");
viewSnapToGrid->setChecked(false);
viewShowGrid->setChecked(false);
@@ -284,35 +284,35 @@ void UMLApp::initActions() {
viewProperties->setEnabled(false);
zoomAction = new KPlayerPopupSliderAction(i18n("&Zoom Slider"), "viewmag", Key_F9,
- TQT_TQOBJECT(this), TQT_SLOT(slotZoomSliderMoved(int)),
+ this, TQT_SLOT(slotZoomSliderMoved(int)),
actionCollection(), "popup_zoom");
zoom100Action = new TDEAction(i18n( "Z&oom to 100%" ), "zoom-original", 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotZoom100() ), actionCollection(),
+ this, TQT_SLOT( slotZoom100() ), actionCollection(),
"zoom100");
- KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() );
+ KStdAction::tipOfDay( this, TQT_SLOT( tipOfTheDay() ), actionCollection() );
TQString moveTabLeftString = i18n("&Move Tab Left");
TQString moveTabRightString = i18n("&Move Tab Right");
moveTabLeft = new TDEAction(TQApplication::reverseLayout() ? moveTabRightString : moveTabLeftString,
TQApplication::reverseLayout() ? "forward" : "back",
TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left,
- TQT_TQOBJECT(this), TQT_SLOT(slotMoveTabLeft()), actionCollection(),
+ this, TQT_SLOT(slotMoveTabLeft()), actionCollection(),
"move_tab_left");
moveTabRight = new TDEAction(TQApplication::reverseLayout() ? moveTabLeftString : moveTabRightString,
TQApplication::reverseLayout() ? "back" : "forward",
TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right,
- TQT_TQOBJECT(this), TQT_SLOT(slotMoveTabRight()), actionCollection(),
+ this, TQT_SLOT(slotMoveTabRight()), actionCollection(),
"move_tab_right");
TQString selectTabLeftString = i18n("Select Diagram on Left");
TQString selectTabRightString = i18n("Select Diagram on Right");
changeTabLeft = new TDEAction(TQApplication::reverseLayout() ? selectTabRightString : selectTabLeftString,
TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left,
- TQT_TQOBJECT(this), TQT_SLOT(slotChangeTabLeft()), actionCollection(), "previous_tab");
+ this, TQT_SLOT(slotChangeTabLeft()), actionCollection(), "previous_tab");
changeTabRight = new TDEAction(TQApplication::reverseLayout() ? selectTabLeftString : selectTabRightString,
TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right,
- TQT_TQOBJECT(this), TQT_SLOT(slotChangeTabRight()), actionCollection(), "next_tab");
+ this, TQT_SLOT(slotChangeTabRight()), actionCollection(), "next_tab");
initStatusBar(); //call this here because the statusBar is shown/hidden by setupGUI()
diff --git a/umbrello/umbrello/umlviewcanvas.cpp b/umbrello/umbrello/umlviewcanvas.cpp
index a505b0bd..e75d711b 100644
--- a/umbrello/umbrello/umlviewcanvas.cpp
+++ b/umbrello/umbrello/umlviewcanvas.cpp
@@ -19,7 +19,7 @@
#include "umlview.h"
-UMLViewCanvas::UMLViewCanvas( UMLView * pView ) : TQCanvas( TQT_TQOBJECT(pView) ) {
+UMLViewCanvas::UMLViewCanvas( UMLView * pView ) : TQCanvas( pView ) {
m_pView = pView;
}