summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-12-21 11:50:28 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-12-21 19:14:52 +0900
commit83b7abfb88bb8d138bab0ab1c9f3e2d3afa418c2 (patch)
tree3f06640cc30ddc08f2603471e4b66a2b108e3eae
parentaa69f1c2ffda0e4e0339c1686a9ff4b3d00f4ac7 (diff)
downloadtdeutils-83b7abfb88bb8d138bab0ab1c9f3e2d3afa418c2.tar.gz
tdeutils-83b7abfb88bb8d138bab0ab1c9f3e2d3afa418c2.zip
Replace various '#define' strings - part 6
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--ark/ark_part.cpp24
-rw-r--r--ark/arkviewer.cpp2
-rw-r--r--ark/mainwindow.cpp20
-rw-r--r--ark/searchbar.cpp2
-rw-r--r--kcalc/dlabel.cpp4
-rw-r--r--kcalc/kcalc.cpp206
-rw-r--r--kcharselect/kcharselectdia.cpp18
-rw-r--r--kdf/kdf.cpp6
-rw-r--r--kdf/kdfwidget.cpp2
-rw-r--r--kdf/kwikdisk.cpp2
-rw-r--r--kedit/kedit.cpp52
-rw-r--r--kedit/ktextfiledlg.cpp2
-rw-r--r--kfloppy/floppy.cpp14
-rw-r--r--kgpg/keyservers.cpp8
-rw-r--r--kgpg/kgpg.cpp74
-rw-r--r--kgpg/kgpgeditor.cpp44
-rw-r--r--kgpg/kgpgview.cpp28
-rw-r--r--kgpg/listkeys.cpp188
-rw-r--r--kgpg/popuppublic.cpp2
-rw-r--r--khexedit/bitswapwidget.cpp8
-rw-r--r--khexedit/fileinfodialog.cpp2
-rw-r--r--khexedit/hexvalidator.cpp2
-rw-r--r--khexedit/parts/kpart/khepart.cpp6
-rw-r--r--khexedit/stringdialog.cpp4
-rw-r--r--khexedit/toplevel.cpp210
-rw-r--r--kjots/KJotsMain.cpp52
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/main.cpp2
-rw-r--r--kregexpeditor/KMultiFormListBox/ccp.cpp2
-rw-r--r--kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp6
-rw-r--r--kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp4
-rw-r--r--kregexpeditor/KMultiFormListBox/widgetwindow.cpp10
-rw-r--r--kregexpeditor/compoundwidget.cpp4
-rw-r--r--kregexpeditor/limitedcharlineedit.cpp2
-rw-r--r--kregexpeditor/regexpbuttons.cpp4
-rw-r--r--kregexpeditor/repeatwidget.cpp4
-rw-r--r--kregexpeditor/textwidget.cpp2
-rw-r--r--ksim/monitors/snmp/browsedialog.cpp2
-rw-r--r--ksim/monitors/snmp/monitorconfig.cpp2
-rw-r--r--ksim/monitors/snmp/probedialog.cpp2
-rw-r--r--superkaramba/src/karamba.cpp10
-rw-r--r--superkaramba/src/karambaapp.cpp6
-rw-r--r--superkaramba/src/menu_python.cpp4
-rw-r--r--superkaramba/src/sklineedit.cpp2
-rw-r--r--superkaramba/src/taskmanager.cpp2
-rw-r--r--superkaramba/src/themefile.cpp4
-rw-r--r--tdefilereplace/tdefilereplace.cpp8
-rw-r--r--tdefilereplace/tdefilereplacepart.cpp66
-rw-r--r--tdelirc/kcmlirc/kcmlircbase.ui.h2
-rw-r--r--tdewallet/kwmapeditor.cpp2
-rw-r--r--tdewallet/tdewalleteditor.cpp18
-rw-r--r--tdewallet/tdewalletmanager.cpp26
-rw-r--r--tdewallet/tdewalletpopup.cpp10
52 files changed, 594 insertions, 594 deletions
diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp
index 9a8cd50..2eaf97a 100644
--- a/ark/ark_part.cpp
+++ b/ark/ark_part.cpp
@@ -116,43 +116,43 @@ ArkPart::~ArkPart()
void
ArkPart::setupActions()
{
- addFileAction = new TDEAction(i18n("Add &File..."), "ark_addfile", 0, TQT_TQOBJECT(awidget),
+ addFileAction = new TDEAction(i18n("Add &File..."), "ark_addfile", 0, awidget,
TQT_SLOT(action_add()), actionCollection(), "addfile");
- addDirAction = new TDEAction(i18n("Add Folde&r..."), "ark_adddir", 0, TQT_TQOBJECT(awidget),
+ addDirAction = new TDEAction(i18n("Add Folde&r..."), "ark_adddir", 0, awidget,
TQT_SLOT(action_add_dir()), actionCollection(), "adddir");
- extractAction = new TDEAction(i18n("E&xtract..."), "ark_extract", 0, TQT_TQOBJECT(awidget),
+ extractAction = new TDEAction(i18n("E&xtract..."), "ark_extract", 0, awidget,
TQT_SLOT(action_extract()), actionCollection(), "extract");
- deleteAction = new TDEAction(i18n("De&lete"), "ark_delete", TDEShortcut(TQt::Key_Delete), TQT_TQOBJECT(awidget),
+ deleteAction = new TDEAction(i18n("De&lete"), "ark_delete", TDEShortcut(TQt::Key_Delete), awidget,
TQT_SLOT(action_delete()), actionCollection(), "delete");
- viewAction = new TDEAction(i18n("to view something","&View"), "ark_view", 0, TQT_TQOBJECT(awidget),
+ viewAction = new TDEAction(i18n("to view something","&View"), "ark_view", 0, awidget,
TQT_SLOT(action_view()), actionCollection(), "view");
- openWithAction = new TDEAction(i18n("&Open With..."), 0, TQT_TQOBJECT(awidget),
+ openWithAction = new TDEAction(i18n("&Open With..."), 0, awidget,
TQT_SLOT(slotOpenWith()), actionCollection(), "open_with");
- editAction = new TDEAction(i18n("Edit &With..."), 0, TQT_TQOBJECT(awidget),
+ editAction = new TDEAction(i18n("Edit &With..."), 0, awidget,
TQT_SLOT(action_edit()), actionCollection(), "edit");
testAction = new TDEAction(i18n("&Test integrity"), 0, awidget,
TQT_SLOT(action_test()), actionCollection(), "test");
- selectAllAction = KStdAction::selectAll(TQT_TQOBJECT(awidget->fileList()), TQT_SLOT(selectAll()), actionCollection(), "select_all");
+ selectAllAction = KStdAction::selectAll(awidget->fileList(), TQT_SLOT(selectAll()), actionCollection(), "select_all");
- deselectAllAction = new TDEAction(i18n("&Unselect All"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all");
+ deselectAllAction = new TDEAction(i18n("&Unselect All"), 0, awidget->fileList(),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all");
- invertSelectionAction = new TDEAction(i18n("&Invert Selection"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(invertSelection()), actionCollection(), "invert_selection");
+ invertSelectionAction = new TDEAction(i18n("&Invert Selection"), 0, awidget->fileList(),TQT_SLOT(invertSelection()), actionCollection(), "invert_selection");
saveAsAction = KStdAction::saveAs(this, TQT_SLOT(file_save_as()), actionCollection());
//KStdAction::preferences(awidget, TQT_SLOT(showSettings()), actionCollection());
- ( void ) new TDEAction( i18n( "Configure &Ark..." ), "configure" , 0, TQT_TQOBJECT(awidget),
+ ( void ) new TDEAction( i18n( "Configure &Ark..." ), "configure" , 0, awidget,
TQT_SLOT( showSettings() ), actionCollection(), "options_configure_ark" );
@@ -161,7 +161,7 @@ ArkPart::setupActions()
showSearchBar->setChecked( ArkSettings::showSearchBar() );
- connect( showSearchBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(awidget), TQT_SLOT( slotShowSearchBarToggled( bool ) ) );
+ connect( showSearchBar, TQT_SIGNAL( toggled( bool ) ), awidget, TQT_SLOT( slotShowSearchBarToggled( bool ) ) );
initialEnables();
}
diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp
index 34f9cfd..6ae8792 100644
--- a/ark/arkviewer.cpp
+++ b/ark/arkviewer.cpp
@@ -86,7 +86,7 @@ bool ArkViewer::view( const KURL& filename )
header->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum );
- m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype->name(), TQString(), m_widget, 0, TQT_TQOBJECT(this) );
+ m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype->name(), TQString(), m_widget, 0, this );
if ( m_part )
{
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index 4726989..255be83 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -49,7 +49,7 @@ MainWindow::MainWindow( TQWidget * /*parent*/, const char *name )
: KParts::MainWindow(), progressDialog( 0 )
{
setXMLFile( "arkui.rc" );
- m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>( "libarkpart", this, name, TQT_TQOBJECT(this), "ArkPart");
+ m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>( "libarkpart", this, name, this, "ArkPart");
if (m_part )
{
//Since most of the functionality is still in ArkWidget:
@@ -109,24 +109,24 @@ MainWindow::~MainWindow()
void
MainWindow::setupActions()
{
- newWindowAction = new TDEAction(i18n("New &Window"), "window-new", TDEShortcut(), TQT_TQOBJECT(this),
+ newWindowAction = new TDEAction(i18n("New &Window"), "window-new", TDEShortcut(), this,
TQT_SLOT(file_newWindow()), actionCollection(), "new_window");
- newArchAction = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection());
- openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_open()), actionCollection());
+ newArchAction = KStdAction::openNew(this, TQT_SLOT(file_new()), actionCollection());
+ openAction = KStdAction::open(this, TQT_SLOT(file_open()), actionCollection());
- reloadAction = new TDEAction(i18n("Re&load"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this),
+ reloadAction = new TDEAction(i18n("Re&load"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), this,
TQT_SLOT(file_reload()), actionCollection(), "reload_arch");
- closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(file_close()), actionCollection(), "file_close");
+ closeAction = KStdAction::close(this, TQT_SLOT(file_close()), actionCollection(), "file_close");
- recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL&)), actionCollection());
+ recent = KStdAction::openRecent(this, TQT_SLOT(openURL(const KURL&)), actionCollection());
recent->loadEntries(kapp->config());
createStandardStatusBarAction();
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(window_close()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(editToolbars()), actionCollection());
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeyBindings()), actionCollection());
+ KStdAction::quit(this, TQT_SLOT(window_close()), actionCollection());
+ KStdAction::configureToolbars(this, TQT_SLOT(editToolbars()), actionCollection());
+ KStdAction::keyBindings(this, TQT_SLOT( slotConfigureKeyBindings()), actionCollection());
openAction->setEnabled( true );
recent->setEnabled( true );
diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp
index 498e3e3..2df9da9 100644
--- a/ark/searchbar.cpp
+++ b/ark/searchbar.cpp
@@ -35,7 +35,7 @@
SearchBar::SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name )
: TDEListViewSearchLine( parent, 0, name )
{
- TDEAction *resetSearch = new TDEAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), aC, "reset_search" );
+ TDEAction *resetSearch = new TDEAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, this, TQT_SLOT( clear() ), aC, "reset_search" );
resetSearch->plug( parent );
resetSearch->setWhatsThis( i18n( "Reset Search\n"
diff --git a/kcalc/dlabel.cpp b/kcalc/dlabel.cpp
index f478b99..ceedeef 100644
--- a/kcalc/dlabel.cpp
+++ b/kcalc/dlabel.cpp
@@ -40,8 +40,8 @@ DispLogic::DispLogic(TQWidget *parent, const char *name,
{
KNumber::setDefaultFloatOutput(true);
KNumber::setDefaultFractionalInput(true);
- _back = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(history_back()), coll);
- _forward = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(history_forward()), coll);
+ _back = KStdAction::undo(this, TQT_SLOT(history_back()), coll);
+ _forward = KStdAction::redo(this, TQT_SLOT(history_forward()), coll);
_forward->setEnabled(false);
_back->setEnabled(false);
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index 3b186fd..886128e 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -147,7 +147,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
i18n("Inverse mode"));
pbInv->setAccel(Key_I);
connect(pbInv, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotInvtoggled(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbInv, TQT_SLOT(slotSetAccelDisplayMode(bool)));
pbInv->setToggleButton(true);
@@ -170,23 +170,23 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
pbMod->addMode(ModeNormal, "Mod", i18n("Modulo"));
pbMod->addMode(ModeInverse, "IntDiv", i18n("Integer division"));
pbMod->setAccel(Key_Colon);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
pbMod, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbMod, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbMod, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotModclicked(void)));
pbReci = new KCalcButton(mSmallPage, "Reciprocal-Button");
pbReci->addMode(ModeNormal, "1/x", i18n("Reciprocal"));
pbReci->setAccel(Key_R);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbReci, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbReci, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotReciclicked(void)));
pbFactorial = new KCalcButton(mSmallPage, "Factorial-Button");
pbFactorial->addMode(ModeNormal, "x!", i18n("Factorial"));
pbFactorial->setAccel(Key_Exclam);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbFactorial, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbFactorial, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotFactorialclicked(void)));
@@ -197,18 +197,18 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
pbSquare = new KCalcButton(mSmallPage, "Square-Button");
pbSquare->addMode(ModeNormal, "x<sup>2</sup>", i18n("Square"), true);
pbSquare->addMode(ModeInverse, "x<sup>3</sup>", i18n("Third power"), true);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbSquare, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
pbSquare, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(pbSquare, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotSquareclicked(void)));
pbRoot = new KSquareButton(mSmallPage, "Square-Button");
pbRoot->addMode(ModeNormal, "sqrt(x)", i18n("Square root"));
pbRoot->addMode(ModeInverse, "sqrt[3](x)", i18n("Cube root"));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbRoot, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
pbRoot, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(pbRoot, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotRootclicked(void)));
@@ -219,9 +219,9 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
pbPower = new KCalcButton(mSmallPage, "Power-Button");
pbPower->addMode(ModeNormal, "x<sup>y</sup>", i18n("x to the power of y"), true);
pbPower->addMode(ModeInverse, "x<sup>1/y</sup>", i18n("x to the power of 1/y"), true);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbPower, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
pbPower, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
pbPower->setAccel(Key_AsciiCircum);
connect(pbPower, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPowerclicked(void)));
@@ -409,12 +409,12 @@ KCalculator::~KCalculator()
void KCalculator::setupMainActions(void)
{
// file menu
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+ KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
// edit menu
- KStdAction::cut(TQT_TQOBJECT(calc_display), TQT_SLOT(slotCut()), actionCollection());
- KStdAction::copy(TQT_TQOBJECT(calc_display), TQT_SLOT(slotCopy()), actionCollection());
- KStdAction::paste(TQT_TQOBJECT(calc_display), TQT_SLOT(slotPaste()), actionCollection());
+ KStdAction::cut(calc_display, TQT_SLOT(slotCut()), actionCollection());
+ KStdAction::copy(calc_display, TQT_SLOT(slotCopy()), actionCollection());
+ KStdAction::paste(calc_display, TQT_SLOT(slotPaste()), actionCollection());
// settings menu
actionStatshow = new TDEToggleAction(i18n("&Statistic Buttons"), 0,
@@ -442,13 +442,13 @@ void KCalculator::setupMainActions(void)
TQT_SLOT(slotConstantsShow(bool)));
- (void) new TDEAction(i18n("&Show All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowAll()),
+ (void) new TDEAction(i18n("&Show All"), 0, this, TQT_SLOT(slotShowAll()),
actionCollection(), "show_all");
- (void) new TDEAction(i18n("&Hide All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAll()),
+ (void) new TDEAction(i18n("&Hide All"), 0, this, TQT_SLOT(slotHideAll()),
actionCollection(), "hide_all");
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection());
+ KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
@@ -486,61 +486,61 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent)
tmp_pb = new KCalcButton("0", thisPage, "0-Button");
tmp_pb->setAccel(Key_0);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 0);
tmp_pb = new KCalcButton("1", thisPage, "1-Button");
tmp_pb->setAccel(Key_1);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 1);
tmp_pb = new KCalcButton("2", thisPage, "2-Button");
tmp_pb->setAccel(Key_2);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 2);
tmp_pb = new KCalcButton("3", thisPage, "3-Button");
tmp_pb->setAccel(Key_3);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 3);
tmp_pb = new KCalcButton("4", thisPage, "4-Button");
tmp_pb->setAccel(Key_4);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 4);
tmp_pb = new KCalcButton("5", thisPage, "5-Button");
tmp_pb->setAccel(Key_5);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 5);
tmp_pb = new KCalcButton("6", thisPage, "6-Button");
tmp_pb->setAccel(Key_6);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 6);
tmp_pb = new KCalcButton("7", thisPage, "7-Button");
tmp_pb->setAccel(Key_7);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 7);
tmp_pb = new KCalcButton("8", thisPage, "8-Button");
tmp_pb->setAccel(Key_8);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 8);
tmp_pb = new KCalcButton("9", thisPage, "9-Button");
tmp_pb->setAccel(Key_9);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 9);
@@ -548,61 +548,61 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent)
pbEE->addMode(ModeNormal, "x<small>" "\xb7" "10</small><sup>y</sup>",
i18n("Exponent"), true);
pbEE->setAccel(Key_E);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbEE, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbEE, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotEEclicked(void)));
pbParenClose = new KCalcButton(")", mLargePage, "ParenClose-Button");
pbParenClose->setAccel(Key_ParenRight);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbParenClose, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbParenClose,TQT_SIGNAL(clicked(void)),TQT_SLOT(slotParenCloseclicked(void)));
pbX = new KCalcButton("X", thisPage, "Multiply-Button", i18n("Multiplication"));
pbX->setAccel(Key_multiply);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbX, TQT_SLOT(slotSetAccelDisplayMode(bool)));
accel()->insert("Pressed '*'", i18n("Pressed Multiplication-Button"),
- 0, Key_Asterisk, TQT_TQOBJECT(pbX), TQT_SLOT(animateClick()));
+ 0, Key_Asterisk, pbX, TQT_SLOT(animateClick()));
connect(pbX, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotXclicked(void)));
pbDivision = new KCalcButton("/", thisPage, "Division-Button", i18n("Division"));
pbDivision->setAccel(Key_Slash);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbDivision, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbDivision, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotDivisionclicked(void)));
pbPlus = new KCalcButton("+", thisPage, "Plus-Button", i18n("Addition"));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbPlus, TQT_SLOT(slotSetAccelDisplayMode(bool)));
pbPlus->setAccel(Key_Plus);
connect(pbPlus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPlusclicked(void)));
pbMinus = new KCalcButton("-", thisPage, "Minus-Button", i18n("Subtraction"));
pbMinus->setAccel(Key_Minus);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbMinus, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbMinus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMinusclicked(void)));
pbPeriod = new KCalcButton(TDEGlobal::locale()->decimalSymbol(), thisPage,
"Period-Button", i18n("Decimal point"));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
- TQT_TQOBJECT(pbPeriod), TQT_SLOT(slotSetAccelDisplayMode(bool)));
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
+ pbPeriod, TQT_SLOT(slotSetAccelDisplayMode(bool)));
accel()->insert("Decimal Point (Period)", i18n("Pressed Decimal Point"),
- 0, Key_Period, TQT_TQOBJECT(pbPeriod), TQT_SLOT(animateClick()));
+ 0, Key_Period, pbPeriod, TQT_SLOT(animateClick()));
accel()->insert("Decimal Point (Comma)", i18n("Pressed Decimal Point"),
- 0, Key_Comma, TQT_TQOBJECT(pbPeriod), TQT_SLOT(animateClick()));
- connect(TQT_TQOBJECT(pbPeriod), TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPeriodclicked(void)));
+ 0, Key_Comma, pbPeriod, TQT_SLOT(animateClick()));
+ connect(pbPeriod, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPeriodclicked(void)));
pbEqual = new KCalcButton("=", thisPage, "Equal-Button", i18n("Result"));
pbEqual->setAccel(Key_Enter);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
- TQT_TQOBJECT(pbEqual), TQT_SLOT(slotSetAccelDisplayMode(bool)));
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
+ pbEqual, TQT_SLOT(slotSetAccelDisplayMode(bool)));
accel()->insert("Entered Equal", i18n("Pressed Equal-Button"),
- 0, Key_Equal, TQT_TQOBJECT(pbEqual), TQT_SLOT(animateClick()));
+ 0, Key_Equal, pbEqual, TQT_SLOT(animateClick()));
accel()->insert("Entered Return", i18n("Pressed Equal-Button"),
- 0, Key_Return, TQT_TQOBJECT(pbEqual), TQT_SLOT(animateClick()));
- connect(TQT_TQOBJECT(pbEqual), TQT_SIGNAL(clicked(void)), TQT_SLOT(slotEqualclicked(void)));
+ 0, Key_Return, pbEqual, TQT_SLOT(animateClick()));
+ connect(pbEqual, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotEqualclicked(void)));
TQGridLayout *thisLayout = new TQGridLayout(thisPage, 5, 4, 0,
@@ -641,7 +641,7 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent)
pbMemRecall = new KCalcButton("MR", mLargePage, "MemRecall-Button", i18n("Memory recall"));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbMemRecall, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbMemRecall, TQT_SIGNAL(clicked(void)),
TQT_SLOT(slotMemRecallclicked(void)));
@@ -650,91 +650,91 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent)
pbMemPlusMinus = new KCalcButton(mLargePage, "MPlusMinus-Button");
pbMemPlusMinus->addMode(ModeNormal, "M+", i18n("Add display to memory"));
pbMemPlusMinus->addMode(ModeInverse, "M-", i18n("Subtract from memory"));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
pbMemPlusMinus, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbMemPlusMinus, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbMemPlusMinus,TQT_SIGNAL(clicked(void)),
TQT_SLOT(slotMemPlusMinusclicked(void)));
pbMemStore = new KCalcButton("MS", mLargePage, "MemStore-Button",
i18n("Memory store"));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbMemStore, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbMemStore, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMemStoreclicked(void)));
pbMC = new KCalcButton("MC", mLargePage, "MemClear-Button", i18n("Clear memory"));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbMC, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbMC, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMCclicked(void)));
pbClear = new KCalcButton("C", mLargePage, "Clear-Button", i18n("Clear"));
pbClear->setAccel(Key_Prior);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
- TQT_TQOBJECT(pbClear), TQT_SLOT(slotSetAccelDisplayMode(bool)));
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
+ pbClear, TQT_SLOT(slotSetAccelDisplayMode(bool)));
accel()->insert("Entered 'ESC'", i18n("Pressed ESC-Button"), 0,
- Key_Escape, TQT_TQOBJECT(pbClear), TQT_SLOT(animateClick()));
- connect(TQT_TQOBJECT(pbClear), TQT_SIGNAL(clicked(void)), TQT_SLOT(slotClearclicked(void)));
+ Key_Escape, pbClear, TQT_SLOT(animateClick()));
+ connect(pbClear, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotClearclicked(void)));
pbAC = new KCalcButton("AC", mLargePage, "AC-Button", i18n("Clear all"));
pbAC->setAccel(Key_Delete);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbAC, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbAC, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotACclicked(void)));
pbParenOpen = new KCalcButton("(", mLargePage, "ParenOpen-Button");
pbParenOpen->setAccel(Key_ParenLeft);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbParenOpen, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbParenOpen, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotParenOpenclicked(void)));
pbPercent = new KCalcButton("%", mLargePage, "Percent-Button", i18n("Percent"));
pbPercent->setAccel(Key_Percent);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbPercent, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbPercent, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPercentclicked(void)));
pbPlusMinus = new KCalcButton("\xb1", mLargePage, "Sign-Button", i18n("Change sign"));
pbPlusMinus->setAccel(Key_Backslash);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
pbPlusMinus, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(pbPlusMinus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPlusMinusclicked(void)));
tmp_pb = new KCalcButton("A", mSmallPage, "A-Button");
tmp_pb->setAccel(Key_A);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 0xA);
tmp_pb = new KCalcButton("B", mSmallPage, "B-Button");
tmp_pb->setAccel(Key_B);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 0xB);
tmp_pb = new KCalcButton("C", mSmallPage, "C-Button");
tmp_pb->setAccel(Key_C);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 0xC);
tmp_pb = new KCalcButton("D", mSmallPage, "D-Button");
tmp_pb->setAccel(Key_D);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 0xD);
tmp_pb = new KCalcButton("E", mSmallPage, "E-Button");
tmp_pb->setAccel(Key_E);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 0xE);
tmp_pb = new KCalcButton("F", mSmallPage, "F-Button");
tmp_pb->setAccel(Key_F);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
NumButtonGroup->insert(tmp_pb, 0xF);
@@ -750,20 +750,20 @@ void KCalculator::setupLogicKeys(TQWidget *parent)
tmp_pb = new KCalcButton("AND", parent, "AND-Button", i18n("Bitwise AND"));
pbLogic.insert("AND", tmp_pb);
tmp_pb->setAccel(Key_Ampersand);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotANDclicked(void)));
tmp_pb = new KCalcButton("OR", parent, "OR-Button", i18n("Bitwise OR"));
pbLogic.insert("OR", tmp_pb);
tmp_pb->setAccel(Key_Bar);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotORclicked(void)));
tmp_pb = new KCalcButton("XOR", parent, "XOR-Button", i18n("Bitwise XOR"));
pbLogic.insert("XOR", tmp_pb);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotXORclicked(void)));
@@ -771,7 +771,7 @@ void KCalculator::setupLogicKeys(TQWidget *parent)
i18n("One's complement"));
pbLogic.insert("One-Complement", tmp_pb);
tmp_pb->setAccel(Key_AsciiTilde);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotNegateclicked(void)));
@@ -779,7 +779,7 @@ void KCalculator::setupLogicKeys(TQWidget *parent)
i18n("Left bit shift"));
tmp_pb->setAccel(Key_Less);
pbLogic.insert("LeftShift", tmp_pb);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)),
TQT_SLOT(slotLeftShiftclicked(void)));
@@ -788,7 +788,7 @@ void KCalculator::setupLogicKeys(TQWidget *parent)
i18n("Right bit shift"));
tmp_pb->setAccel(Key_Greater);
pbLogic.insert("RightShift", tmp_pb);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)),
TQT_SLOT(slotRightShiftclicked(void)));
@@ -803,7 +803,7 @@ void KCalculator::setupScientificKeys(TQWidget *parent)
tmp_pb = new KCalcButton("Hyp", parent, "Hyp-Button", i18n("Hyperbolic mode"));
pbScientific.insert("HypMode", tmp_pb);
tmp_pb->setAccel(Key_H);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHyptoggled(bool)));
tmp_pb->setToggleButton(true);
@@ -816,9 +816,9 @@ void KCalculator::setupScientificKeys(TQWidget *parent)
tmp_pb->addMode(ButtonModeFlags(ModeInverse | ModeHyperbolic),
"Asinh", i18n("Inverse hyperbolic sine"));
tmp_pb->setAccel(Key_S);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotSinclicked(void)));
@@ -830,9 +830,9 @@ void KCalculator::setupScientificKeys(TQWidget *parent)
tmp_pb->addMode(ButtonModeFlags(ModeInverse | ModeHyperbolic),
"Acosh", i18n("Inverse hyperbolic cosine"));
tmp_pb->setAccel(Key_C);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotCosclicked(void)));
@@ -844,9 +844,9 @@ void KCalculator::setupScientificKeys(TQWidget *parent)
tmp_pb->addMode(ButtonModeFlags(ModeInverse | ModeHyperbolic),
"Atanh", i18n("Inverse hyperbolic tangent"));
tmp_pb->setAccel(Key_T);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotTanclicked(void)));
@@ -856,9 +856,9 @@ void KCalculator::setupScientificKeys(TQWidget *parent)
true);
pbScientific.insert("LogNatural", tmp_pb);
tmp_pb->setAccel(Key_N);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotLnclicked(void)));
@@ -868,9 +868,9 @@ void KCalculator::setupScientificKeys(TQWidget *parent)
true);
pbScientific.insert("Log10", tmp_pb);
tmp_pb->setAccel(Key_L);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotLogclicked(void)));
@@ -888,9 +888,9 @@ void KCalculator::setupStatisticKeys(TQWidget *parent)
+ "x", i18n("Sum of all data items"));
pbStat.insert("NumData", tmp_pb);
mStatButtonList.append(tmp_pb);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatNumclicked(void)));
@@ -899,7 +899,7 @@ void KCalculator::setupStatisticKeys(TQWidget *parent)
pbStat.insert("Median", tmp_pb);
mStatButtonList.append(tmp_pb);
TQToolTip::add(tmp_pb, i18n("Median"));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatMedianclicked(void)));
@@ -910,9 +910,9 @@ void KCalculator::setupStatisticKeys(TQWidget *parent)
i18n("Sum of all data items squared"), true);
pbStat.insert("Mean", tmp_pb);
mStatButtonList.append(tmp_pb);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatMeanclicked(void)));
@@ -923,9 +923,9 @@ void KCalculator::setupStatisticKeys(TQWidget *parent)
i18n("Standard deviation"), true);
pbStat.insert("StandardDeviation", tmp_pb);
mStatButtonList.append(tmp_pb);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatStdDevclicked(void)));
@@ -934,9 +934,9 @@ void KCalculator::setupStatisticKeys(TQWidget *parent)
tmp_pb->addMode(ModeInverse, "CDat", i18n("Delete last data item"));
pbStat.insert("InputData", tmp_pb);
mStatButtonList.append(tmp_pb);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatDataInputclicked(void)));
@@ -944,7 +944,7 @@ void KCalculator::setupStatisticKeys(TQWidget *parent)
tmp_pb->addMode(ModeNormal, "CSt", i18n("Clear data store"));
pbStat.insert("ClearData", tmp_pb);
mStatButtonList.append(tmp_pb);
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatClearDataclicked(void)));
}
@@ -961,54 +961,54 @@ void KCalculator::setupConstantsKeys(TQWidget *parent)
tmp_pb = new KCalcConstButton(parent, 0, "C1");
tmp_pb->setAccel(ALT + Key_1);
pbConstant[0] = tmp_pb;
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
ConstButtonGroup->insert(tmp_pb, 0);
tmp_pb = new KCalcConstButton(parent, 1, "C2");
tmp_pb->setAccel(ALT + Key_2);
pbConstant[1] = tmp_pb;
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
ConstButtonGroup->insert(tmp_pb, 1);
tmp_pb = new KCalcConstButton(parent, 2, "C3");
tmp_pb->setAccel(ALT + Key_3);
pbConstant[2] = tmp_pb;
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
ConstButtonGroup->insert(tmp_pb, 2);
tmp_pb = new KCalcConstButton(parent, 3, "C4");
tmp_pb->setAccel(ALT + Key_4);
pbConstant[3] = tmp_pb;
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
ConstButtonGroup->insert(tmp_pb, 3);
tmp_pb = new KCalcConstButton(parent, 4, "C5");
tmp_pb->setAccel(ALT + Key_5);
pbConstant[4] = tmp_pb;
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
ConstButtonGroup->insert(tmp_pb, 4);
tmp_pb = new KCalcConstButton(parent, 5, "C6");
tmp_pb->setAccel(ALT + Key_6);
pbConstant[5] = tmp_pb;
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchShowAccels(bool)),
+ connect(this, TQT_SIGNAL(switchShowAccels(bool)),
tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool)));
- connect(TQT_TQOBJECT(this), TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
+ connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)),
tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool)));
ConstButtonGroup->insert(tmp_pb, 5);
diff --git a/kcharselect/kcharselectdia.cpp b/kcharselect/kcharselectdia.cpp
index 8750b68..8f8b2a9 100644
--- a/kcharselect/kcharselectdia.cpp
+++ b/kcharselect/kcharselectdia.cpp
@@ -77,27 +77,27 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
grid->addWidget( bClip, 2, 3 );
// Build menu
- KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(_exit()), actionCollection() );
+ KStdAction::quit( this, TQT_SLOT(_exit()), actionCollection() );
new TDEAction(i18n("&To Clipboard"), "edit-copy",
- TDEStdAccel::shortcut(TDEStdAccel::Copy), TQT_TQOBJECT(this), TQT_SLOT(toClip()), actionCollection(), "copy_clip" );
+ TDEStdAccel::shortcut(TDEStdAccel::Copy), this, TQT_SLOT(toClip()), actionCollection(), "copy_clip" );
- (void)new TDEAction(i18n("To Clipboard &UTF-8"), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction(i18n("To Clipboard &UTF-8"), 0, this,
TQT_SLOT(toClipUTF8()), actionCollection(), "copy_utf_8" );
- (void)new TDEAction(i18n("To Clipboard &HTML"), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction(i18n("To Clipboard &HTML"), 0, this,
TQT_SLOT(toClipHTML()), actionCollection(), "copy_html" );
new TDEAction(i18n("&From Clipboard"), "edit-paste",
- TDEStdAccel::shortcut(TDEStdAccel::Paste), TQT_TQOBJECT(this), TQT_SLOT(fromClip()), actionCollection(), "from_clip" );
- (void)new TDEAction(i18n("From Clipboard UTF-8"), 0, TQT_TQOBJECT(this),
+ TDEStdAccel::shortcut(TDEStdAccel::Paste), this, TQT_SLOT(fromClip()), actionCollection(), "from_clip" );
+ (void)new TDEAction(i18n("From Clipboard UTF-8"), 0, this,
TQT_SLOT(fromClipUTF8()), actionCollection(), "from_clip_utf8" );
i18n("From Clipboard HTML"); // Intended for future use
- KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(clear()), actionCollection(), "clear");
- (void)new TDEAction(i18n("&Flip"), 0, TQT_TQOBJECT(this),
+ KStdAction::clear(this, TQT_SLOT(clear()), actionCollection(), "clear");
+ (void)new TDEAction(i18n("&Flip"), 0, this,
TQT_SLOT(flipText()), actionCollection(), "flip" );
- (void)new TDEAction(i18n("&Alignment"), 0, TQT_TQOBJECT(this),
+ (void)new TDEAction(i18n("&Alignment"), 0, this,
TQT_SLOT(toggleEntryDirection()), actionCollection(), "alignment" );
charSelect->setFocus();
diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp
index e316b3e..60b590d 100644
--- a/kdf/kdf.cpp
+++ b/kdf/kdf.cpp
@@ -41,10 +41,10 @@ KDFTopLevel::KDFTopLevel(TQWidget *, const char *name)
{
kdf = new KDFWidget(this,"kdf",FALSE);
TQ_CHECK_PTR(kdf);
- (void) new TDEAction( i18n( "&Update" ), 0, TQT_TQOBJECT(kdf), TQT_SLOT( updateDF() ), actionCollection(), "updatedf" );
+ (void) new TDEAction( i18n( "&Update" ), 0, kdf, TQT_SLOT( updateDF() ), actionCollection(), "updatedf" );
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(kdf), TQT_SLOT(settingsBtnClicked()), actionCollection());
+ KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+ KStdAction::preferences(kdf, TQT_SLOT(settingsBtnClicked()), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
setCentralWidget(kdf);
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index 7c5121d..5a759ed 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -283,7 +283,7 @@ void KDFWidget::setUpdateFrequency( int frequency )
// Kill current timer and restart it if the frequency is
// larger than zero.
//
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
if( frequency > 0 )
{
startTimer( frequency * 1000 );
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index c06e9c2..6b9dafb 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -134,7 +134,7 @@ void KwikDisk::setUpdateFrequency(int frequency)
// Kill current timer and restart it if the frequency is
// larger than zero.
//
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
if( frequency > 0 )
{
startTimer(frequency * 1000);
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index 51d04b6..95227a9 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -193,42 +193,42 @@ void TopLevel::slotSelectionChanged()
void TopLevel::setupActions()
{
// setup File menu
- KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection());
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_open()), actionCollection());
- recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)),
+ KStdAction::openNew(this, TQT_SLOT(file_new()), actionCollection());
+ KStdAction::open(this, TQT_SLOT(file_open()), actionCollection());
+ recent = KStdAction::openRecent(this, TQT_SLOT(openRecent(const KURL&)),
actionCollection());
- KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(file_save()), actionCollection());
- KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(file_save_as()), actionCollection());
- KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(file_close()), actionCollection());
- KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection());
- KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection());
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+ KStdAction::save(this, TQT_SLOT(file_save()), actionCollection());
+ KStdAction::saveAs(this, TQT_SLOT(file_save_as()), actionCollection());
+ KStdAction::close(this, TQT_SLOT(file_close()), actionCollection());
+ KStdAction::print(this, TQT_SLOT(print()), actionCollection());
+ KStdAction::mail(this, TQT_SLOT(mail()), actionCollection());
+ KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
// setup edit menu
- undoAction = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(undo()), actionCollection());
- redoAction = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(redo()), actionCollection());
- cutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(cut()), actionCollection());
- copyAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection());
- KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection());
- KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(select_all()), actionCollection());
- KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection());
- KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(search_again()), actionCollection());
- KStdAction::replace(TQT_TQOBJECT(this), TQT_SLOT(replace()), actionCollection());
-
- (void)new TDEAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(file_insert()),
+ undoAction = KStdAction::undo(this, TQT_SLOT(undo()), actionCollection());
+ redoAction = KStdAction::redo(this, TQT_SLOT(redo()), actionCollection());
+ cutAction = KStdAction::cut(this, TQT_SLOT(cut()), actionCollection());
+ copyAction = KStdAction::copy(this, TQT_SLOT(copy()), actionCollection());
+ KStdAction::pasteText(this, TQT_SLOT(paste()), actionCollection());
+ KStdAction::selectAll(this, TQT_SLOT(select_all()), actionCollection());
+ KStdAction::find(this, TQT_SLOT(search()), actionCollection());
+ KStdAction::findNext(this, TQT_SLOT(search_again()), actionCollection());
+ KStdAction::replace(this, TQT_SLOT(replace()), actionCollection());
+
+ (void)new TDEAction(i18n("&Insert File..."), 0, this, TQT_SLOT(file_insert()),
actionCollection(), "insert_file");
- (void)new TDEAction(i18n("In&sert Date"), 0, TQT_TQOBJECT(this), TQT_SLOT(insertDate()),
+ (void)new TDEAction(i18n("In&sert Date"), 0, this, TQT_SLOT(insertDate()),
actionCollection(), "insert_date");
- (void)new TDEAction(i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(clean_space()),
+ (void)new TDEAction(i18n("Cl&ean Spaces"), 0, this, TQT_SLOT(clean_space()),
actionCollection(), "clean_spaces");
// setup Tools menu
- KStdAction::spelling(TQT_TQOBJECT(this), TQT_SLOT(spellcheck()), actionCollection());
+ KStdAction::spelling(this, TQT_SLOT(spellcheck()), actionCollection());
// setup Go menu
- KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), actionCollection());
+ KStdAction::gotoLine(this, TQT_SLOT(gotoLine()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection());
+ KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection());
}
void TopLevel::setupStatusBar()
@@ -388,7 +388,7 @@ void TopLevel::spellcheck()
statusBar()->changeItem(i18n("Spellcheck: Started."), ID_GENERAL);
initSpellConfig();
- tdespell = new KSpell(this, i18n("Spellcheck"), TQT_TQOBJECT(this),
+ tdespell = new KSpell(this, i18n("Spellcheck"), this,
TQT_SLOT( spell_started(KSpell *)), tdespellconfigOptions);
connect (tdespell, TQT_SIGNAL ( death()),
diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp
index 6df31be..7c8b22b 100644
--- a/kedit/ktextfiledlg.cpp
+++ b/kedit/ktextfiledlg.cpp
@@ -62,7 +62,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir,
TDEAction* mEncoding = new TDEAction(
i18n("Select Encoding..."), 0,
- TQT_TQOBJECT(this), TQT_SLOT( slotShowEncCombo() ), TQT_TQOBJECT(this), "encoding");
+ this, TQT_SLOT( slotShowEncCombo() ), this, "encoding");
mEncoding->setIcon( TQString::fromLatin1("charset") );
diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp
index a75de45..cf9601d 100644
--- a/kfloppy/floppy.cpp
+++ b/kfloppy/floppy.cpp
@@ -536,7 +536,7 @@ void FloppyData::format(){
}
if (formatActions) delete formatActions;
- formatActions = new KFActionQueue(TQT_TQOBJECT(this));
+ formatActions = new KFActionQueue(this);
connect(formatActions,TQT_SIGNAL(status(const TQString &,int)),
this,TQT_SLOT(formatStatus(const TQString &,int)));
@@ -550,7 +550,7 @@ void FloppyData::format(){
}
else if ( zerooutformat->isChecked() )
{
- DDZeroOut* f = new DDZeroOut( TQT_TQOBJECT(this) );
+ DDZeroOut* f = new DDZeroOut( this );
if ( userDevice )
{
f->configureDevice( currentComboBoxDevice );
@@ -569,7 +569,7 @@ void FloppyData::format(){
}
else
{
- FDFormat *f = new FDFormat(TQT_TQOBJECT(this));
+ FDFormat *f = new FDFormat(this);
f->configureDevice(drive,blocks);
f->configure(verifylabel->isChecked());
formatActions->queue(f);
@@ -577,7 +577,7 @@ void FloppyData::format(){
if ( filesystemComboBox->currentText() == i18n("DOS") )
{
- FATFilesystem *f = new FATFilesystem(TQT_TQOBJECT(this));
+ FATFilesystem *f = new FATFilesystem(this);
f->configure(verifylabel->isChecked(),
labellabel->isChecked(),
lineedit->text());
@@ -594,7 +594,7 @@ void FloppyData::format(){
else if ( filesystemComboBox->currentText() == i18n("ext2") )
{
- Ext2Filesystem *f = new Ext2Filesystem(TQT_TQOBJECT(this));
+ Ext2Filesystem *f = new Ext2Filesystem(this);
f->configure(verifylabel->isChecked(),
labellabel->isChecked(),
lineedit->text());
@@ -612,7 +612,7 @@ void FloppyData::format(){
#ifdef ANY_BSD
else if ( filesystemComboBox->currentText() == i18n("UFS") )
{
- FloppyAction *f = new UFSFilesystem(TQT_TQOBJECT(this));
+ FloppyAction *f = new UFSFilesystem(this);
f->configureDevice(drive,blocks);
formatActions->queue(f);
}
@@ -621,7 +621,7 @@ void FloppyData::format(){
#ifdef ANY_LINUX
else if ( filesystemComboBox->currentText() == i18n("Minix") )
{
- MinixFilesystem *f = new MinixFilesystem(TQT_TQOBJECT(this));
+ MinixFilesystem *f = new MinixFilesystem(this);
f->configure(verifylabel->isChecked(),
labellabel->isChecked(),
lineedit->text());
diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp
index 639ca67..63880c9 100644
--- a/kgpg/keyservers.cpp
+++ b/kgpg/keyservers.cpp
@@ -631,8 +631,8 @@ void keyServer::slotImport()
keyNames=keyNames.stripWhiteSpace();
*searchproc<< TQString(TQFile::encodeName(fkeyNames));
}
- TQObject::connect(searchproc, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(slotksearchprocresult(TDEProcess *)));
- TQObject::connect(searchproc, TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this), TQT_SLOT(slotsearchread(KProcIO *)));
+ TQObject::connect(searchproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotksearchprocresult(TDEProcess *)));
+ TQObject::connect(searchproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotsearchread(KProcIO *)));
TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor));
searchproc->setUsePty(TDEProcess::Stdout,false); // EKO: very important line - it took me a day to find out why I should use it
searchproc->start(TDEProcess::Block,true);
@@ -663,8 +663,8 @@ void keyServer::slotImport()
*importproc<< (*it) ;
}
- TQObject::connect(importproc, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(slotimportresult(TDEProcess *)));
- TQObject::connect(importproc, TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this), TQT_SLOT(slotimportread(KProcIO *)));
+ TQObject::connect(importproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotimportresult(TDEProcess *)));
+ TQObject::connect(importproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotimportread(KProcIO *)));
importproc->start(TDEProcess::NotifyOnExit,true);
importproc->closeWhenDone();
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index 0d7acd2..d405c33 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -84,10 +84,10 @@ MyView::MyView( TQWidget *parent, const char *name )
setBackgroundMode( X11ParentRelative );
openTasks=0;
- TDEAction *saveDecrypt=new TDEAction(i18n("&Decrypt && Save File"),"decrypted",0,TQT_TQOBJECT(this), TQT_SLOT(decryptDroppedFile()),TQT_TQOBJECT(this),"decrypt_file");
- TDEAction *showDecrypt=new TDEAction(i18n("&Show Decrypted File"),"edit",0,TQT_TQOBJECT(this), TQT_SLOT(showDroppedFile()),TQT_TQOBJECT(this),"show_file");
- TDEAction *encrypt=new TDEAction(i18n("&Encrypt File"),"encrypted",0,TQT_TQOBJECT(this), TQT_SLOT(encryptDroppedFile()),TQT_TQOBJECT(this),"encrypt_file");
- TDEAction *sign=new TDEAction(i18n("&Sign File"), "signature",0,TQT_TQOBJECT(this), TQT_SLOT(signDroppedFile()),TQT_TQOBJECT(this),"sign_file");
+ TDEAction *saveDecrypt=new TDEAction(i18n("&Decrypt && Save File"),"decrypted",0,this, TQT_SLOT(decryptDroppedFile()),this,"decrypt_file");
+ TDEAction *showDecrypt=new TDEAction(i18n("&Show Decrypted File"),"edit",0,this, TQT_SLOT(showDroppedFile()),this,"show_file");
+ TDEAction *encrypt=new TDEAction(i18n("&Encrypt File"),"encrypted",0,this, TQT_SLOT(encryptDroppedFile()),this,"encrypt_file");
+ TDEAction *sign=new TDEAction(i18n("&Sign File"), "signature",0,this, TQT_SLOT(signDroppedFile()),this,"sign_file");
//TQToolTip::add(this,i18n("KGpg drag & drop encryption applet"));
readOptions();
@@ -118,7 +118,7 @@ MyView::~MyView()
void MyView::clipEncrypt()
{
popupPublic *dialoguec=new popupPublic(0, "public_keys", 0,false,goDefaultKey);
- connect(dialoguec,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),TQT_TQOBJECT(this),TQT_SLOT(encryptClipboard(TQStringList,TQStringList,bool,bool)));
+ connect(dialoguec,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQT_SLOT(encryptClipboard(TQStringList,TQStringList,bool,bool)));
dialoguec->exec();
delete dialoguec;
}
@@ -135,7 +135,7 @@ void MyView::clipSign(bool openEditor)
if (!clippie.isEmpty()) {
KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey);
connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont)));
- connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),TQT_TQOBJECT(this),TQT_SLOT(encryptFiles(KURL::List)));
+ connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),this,TQT_SLOT(encryptFiles(KURL::List)));
if (!openEditor)
connect(kgpgtxtedit->view,TQT_SIGNAL(verifyFinished()),kgpgtxtedit,TQT_SLOT(closeWindow()));
kgpgtxtedit->view->editor->setText(clippie);
@@ -164,8 +164,8 @@ void MyView::encryptDroppedFolder()
optionbx->insertItem(i18n("Bzip2"));
bGroup->show();
connect(dialogue,TQT_SIGNAL(keyListFilled ()),dialogue,TQT_SLOT(slotSetVisible()));
- connect(optionbx,TQT_SIGNAL(activated (int)),TQT_TQOBJECT(this),TQT_SLOT(slotSetCompression(int)));
- connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),TQT_TQOBJECT(this),TQT_SLOT(startFolderEncode(TQStringList,TQStringList,bool,bool)));
+ connect(optionbx,TQT_SIGNAL(activated (int)),this,TQT_SLOT(slotSetCompression(int)));
+ connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQT_SLOT(startFolderEncode(TQStringList,TQStringList,bool,bool)));
dialogue->CBshred->setEnabled(false);
dialogue->exec();
dialogue=0L;
@@ -236,8 +236,8 @@ pop = new KPassivePopup();
KgpgInterface *folderprocess=new KgpgInterface();
folderprocess->KgpgEncryptFile(selec,KURL(kgpgfoldertmp->name()),encryptedFile,encryptOptions,symetric);
- connect(folderprocess,TQT_SIGNAL(encryptionfinished(KURL)),TQT_TQOBJECT(this),TQT_SLOT(slotFolderFinished(KURL)));
- connect(folderprocess,TQT_SIGNAL(errormessage(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotFolderFinishedError(TQString)));
+ connect(folderprocess,TQT_SIGNAL(encryptionfinished(KURL)),this,TQT_SLOT(slotFolderFinished(KURL)));
+ connect(folderprocess,TQT_SIGNAL(errormessage(TQString)),this,TQT_SLOT(slotFolderFinishedError(TQString)));
}
void MyView::slotFolderFinished(KURL)
@@ -280,7 +280,7 @@ void MyView::encryptDroppedFile()
{
TQStringList opts;
KgpgLibrary *lib=new KgpgLibrary(this,KGpgSettings::pgpExtension());
- connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),TQT_TQOBJECT(this),TQT_SLOT(busyMessage(TQString,bool)));
+ connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),this,TQT_SLOT(busyMessage(TQString,bool)));
if (KGpgSettings::fileKey()!=TQString()) {
if (KGpgSettings::allowUntrustedKeys())
opts<<"--always-trust";
@@ -315,7 +315,7 @@ lb->insertStringList(droppedUrls.toStringList());
if (shredConfirm->exec()==TQDialog::Accepted)
{
KgpgLibrary *lib=new KgpgLibrary(this);
- connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),TQT_TQOBJECT(this),TQT_SLOT(busyMessage(TQString,bool)));
+ connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),this,TQT_SLOT(busyMessage(TQString,bool)));
lib->shredprocessenc(droppedUrls);
}
delete shredConfirm;
@@ -348,7 +348,7 @@ void MyView::slotVerifyFile()
///////////////////////// pipe gpg command
KgpgInterface *verifyFileProcess=new KgpgInterface();
verifyFileProcess->KgpgVerifyFile(droppedUrl,KURL(sigfile));
- connect (verifyFileProcess,TQT_SIGNAL(verifyquerykey(TQString)),TQT_TQOBJECT(this),TQT_SLOT(importSignature(TQString)));
+ connect (verifyFileProcess,TQT_SIGNAL(verifyquerykey(TQString)),this,TQT_SLOT(importSignature(TQString)));
}
void MyView::importSignature(TQString ID)
@@ -423,10 +423,10 @@ void MyView::decryptDroppedFile()
}
KgpgLibrary *lib=new KgpgLibrary(this);
lib->slotFileDec(droppedUrls.first(),swapname,KGpgSettings::customDecrypt());
- connect(lib,TQT_SIGNAL(importOver(TQStringList)),TQT_TQOBJECT(this),TQT_SIGNAL(importedKeys(TQStringList)));
- connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),TQT_TQOBJECT(this),TQT_SLOT(busyMessage(TQString,bool)));
+ connect(lib,TQT_SIGNAL(importOver(TQStringList)),this,TQT_SIGNAL(importedKeys(TQStringList)));
+ connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),this,TQT_SLOT(busyMessage(TQString,bool)));
// if (isFolder)
- connect(lib,TQT_SIGNAL(decryptionOver()),TQT_TQOBJECT(this),TQT_SLOT(decryptNextFile()));
+ connect(lib,TQT_SIGNAL(decryptionOver()),this,TQT_SLOT(decryptNextFile()));
}
@@ -466,10 +466,10 @@ void MyView::showDroppedFile()
kdDebug(2100)<<"------Show dropped file"<<endl;
KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey);
kgpgtxtedit->view->editor->slotDroppedFile(droppedUrls.first());
- connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),TQT_TQOBJECT(this),TQT_SLOT(encryptFiles(KURL::List)));
+ connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),this,TQT_SLOT(encryptFiles(KURL::List)));
connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont)));
- connect(kgpgtxtedit,TQT_SIGNAL(refreshImported(TQStringList)),TQT_TQOBJECT(this),TQT_SIGNAL(importedKeys(TQStringList)));
- connect(kgpgtxtedit->view->editor,TQT_SIGNAL(refreshImported(TQStringList)),TQT_TQOBJECT(this),TQT_SIGNAL(importedKeys(TQStringList)));
+ connect(kgpgtxtedit,TQT_SIGNAL(refreshImported(TQStringList)),this,TQT_SIGNAL(importedKeys(TQStringList)));
+ connect(kgpgtxtedit->view->editor,TQT_SIGNAL(refreshImported(TQStringList)),this,TQT_SIGNAL(importedKeys(TQStringList)));
kgpgtxtedit->show();
}
@@ -523,7 +523,7 @@ void MyView::droppedtext (TQString inputText,bool allowEncrypt)
if (inputText.startsWith("-----BEGIN PGP MESSAGE")) {
KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey);
- connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),TQT_TQOBJECT(this),TQT_SLOT(encryptFiles(KURL::List)));
+ connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),this,TQT_SLOT(encryptFiles(KURL::List)));
connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont)));
kgpgtxtedit->view->editor->setText(inputText);
kgpgtxtedit->view->slotdecode();
@@ -537,7 +537,7 @@ void MyView::droppedtext (TQString inputText,bool allowEncrypt)
else {
KgpgInterface *importKeyProcess=new KgpgInterface();
importKeyProcess->importKey(inputText);
- connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),TQT_TQOBJECT(this),TQT_SIGNAL(importedKeys(TQStringList)));
+ connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),this,TQT_SIGNAL(importedKeys(TQStringList)));
return;
}
}
@@ -710,17 +710,17 @@ void MyView::startWizard()
}
wiz->CBdefault->setCurrentItem(firstKey);
- //connect(wiz->pushButton4,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(slotGenKey()));
+ //connect(wiz->pushButton4,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotGenKey()));
if (!counter)
- connect(wiz->finishButton(),TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(slotGenKey()));
+ connect(wiz->finishButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotGenKey()));
else {
wiz->textGenerate->hide();
wiz->setTitle(wiz->page_4,i18n("Step Three: Select your Default Private Key"));
- connect(wiz->finishButton(),TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(slotSaveOptionsPath()));
+ connect(wiz->finishButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotSaveOptionsPath()));
}
- connect(wiz->nextButton(),TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(slotWizardChange()));
+ connect(wiz->nextButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotWizardChange()));
connect( wiz , TQT_SIGNAL( destroyed() ) , this, TQT_SLOT( slotWizardClose()));
- connect(wiz,TQT_SIGNAL(helpClicked()),TQT_TQOBJECT(this),TQT_SLOT(help()));
+ connect(wiz,TQT_SIGNAL(helpClicked()),this,TQT_SLOT(help()));
wiz->setFinishEnabled(wiz->page_4,true);
wiz->show();
@@ -838,19 +838,19 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name)
w=new MyView(this);
w->show();
TDEPopupMenu *conf_menu=contextMenu();
- KgpgEncryptClipboard = new TDEAction(i18n("&Encrypt Clipboard"), "kgpg", 0,TQT_TQOBJECT(w), TQT_SLOT(clipEncrypt()),actionCollection(),"clip_encrypt");
- KgpgDecryptClipboard = new TDEAction(i18n("&Decrypt Clipboard"), 0, 0,TQT_TQOBJECT(w), TQT_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt");
- KgpgSignClipboard = new TDEAction(i18n("&Sign/Verify Clipboard"), "signature", 0,TQT_TQOBJECT(w), TQT_SLOT(clipSign()),actionCollection(),"clip_sign");
+ KgpgEncryptClipboard = new TDEAction(i18n("&Encrypt Clipboard"), "kgpg", 0,w, TQT_SLOT(clipEncrypt()),actionCollection(),"clip_encrypt");
+ KgpgDecryptClipboard = new TDEAction(i18n("&Decrypt Clipboard"), 0, 0,w, TQT_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt");
+ KgpgSignClipboard = new TDEAction(i18n("&Sign/Verify Clipboard"), "signature", 0,w, TQT_SLOT(clipSign()),actionCollection(),"clip_sign");
TDEAction *KgpgOpenEditor;
if (KGpgSettings::leftClick()==KGpgSettings::EnumLeftClick::KeyManager)
- KgpgOpenEditor = new TDEAction(i18n("&Open Editor"), "edit", 0,TQT_TQOBJECT(parent), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor");
+ KgpgOpenEditor = new TDEAction(i18n("&Open Editor"), "edit", 0,parent, TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor");
else
- KgpgOpenEditor = new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenKeyManager()),actionCollection(),"kgpg_editor");
+ KgpgOpenEditor = new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,this, TQT_SLOT(slotOpenKeyManager()),actionCollection(),"kgpg_editor");
- TDEAction *KgpgOpenServer = new TDEAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenServerDialog()),actionCollection(),"kgpg_server");
- TDEAction *KgpgPreferences=KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection());
+ TDEAction *KgpgOpenServer = new TDEAction(i18n("&Key Server Dialog"), "network", 0,this, TQT_SLOT(slotOpenServerDialog()),actionCollection(),"kgpg_server");
+ TDEAction *KgpgPreferences=KStdAction::preferences(this, TQT_SLOT(showOptions()), actionCollection());
- connect (conf_menu,TQT_SIGNAL(aboutToShow()),TQT_TQOBJECT(this),TQT_SLOT(checkMenu()));
+ connect (conf_menu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(checkMenu()));
KgpgEncryptClipboard->plug(conf_menu);
KgpgDecryptClipboard->plug(conf_menu);
@@ -976,7 +976,7 @@ int KgpgAppletApp::newInstance()
connect( kgpg_applet, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotHandleQuit()));
connect(s_keyManager,TQT_SIGNAL(readAgainOptions()),kgpg_applet->w,TQT_SLOT(readOptions()));
- connect(kgpg_applet->w,TQT_SIGNAL(updateDefault(TQString)),TQT_TQOBJECT(this),TQT_SLOT(wizardOver(TQString)));
+ connect(kgpg_applet->w,TQT_SIGNAL(updateDefault(TQString)),this,TQT_SLOT(wizardOver(TQString)));
connect(kgpg_applet->w,TQT_SIGNAL(createNewKey()),s_keyManager,TQT_SLOT(slotgenkey()));
connect(s_keyManager,TQT_SIGNAL(fontChanged(TQFont)),kgpg_applet->w,TQT_SIGNAL(setFont(TQFont)));
connect(kgpg_applet->w,TQT_SIGNAL(importedKeys(TQStringList)),s_keyManager->keysList2,TQT_SLOT(slotReloadKeys(TQStringList)));
@@ -1079,8 +1079,8 @@ void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,boo
if (symmetric) selec.clear();
KgpgInterface *txtEncrypt=new KgpgInterface();
- connect (txtEncrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotSetClip(TQString)));
- connect (txtEncrypt,TQT_SIGNAL(txtencryptionstarted()),TQT_TQOBJECT(this),TQT_SLOT(slotPassiveClip()));
+ connect (txtEncrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),this,TQT_SLOT(slotSetClip(TQString)));
+ connect (txtEncrypt,TQT_SIGNAL(txtencryptionstarted()),this,TQT_SLOT(slotPassiveClip()));
txtEncrypt->KgpgEncryptText(kapp->clipboard()->text(clipboardMode),selec,encryptOptions);
}
diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp
index b60ee8d..922d2be 100644
--- a/kgpg/kgpgeditor.cpp
+++ b/kgpg/kgpgeditor.cpp
@@ -126,30 +126,30 @@ void KgpgApp::readOptions(bool doresize)
void KgpgApp::initActions()
{
- KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection());
- KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection());
- KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection());
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection());
- KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection());
- KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection());
- KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection());
- KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotOptions()), actionCollection(),"kgpg_config");
+ KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection());
+ KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
+ KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection());
+ KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection());
+ KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection());
+ KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection());
+ KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection());
+ KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection());
+ KStdAction::preferences(this, TQT_SLOT(slotOptions()), actionCollection(),"kgpg_config");
//KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
- //KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
-
- fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
- (void) new TDEAction(i18n("&Encrypt File..."), "encrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreEnc()), actionCollection(),"file_encrypt");
- (void) new TDEAction(i18n("&Decrypt File..."), "decrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreDec()), actionCollection(),"file_decrypt");
- (void) new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotKeyManager()), actionCollection(),"key_manage");
- editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotundo()), actionCollection());
- editRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotredo()), actionCollection());
- //(void) new TDEAction(i18n("&Manage Keys"), "kgpg_manage", CTRL+Key_K,TQT_TQOBJECT(this), TQT_SLOT(slotManageKey()), actionCollection(),"keys_manage");
- (void) new TDEAction(i18n("&Generate Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreSignFile()), actionCollection(), "sign_generate");
- (void) new TDEAction(i18n("&Verify Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreVerifyFile()), actionCollection(), "sign_verify");
- (void) new TDEAction(i18n("&Check MD5 Sum..."), 0,TQT_TQOBJECT(this), TQT_SLOT(slotCheckMd5()), actionCollection(), "sign_check");
- KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection());
+ //KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection());
+
+ fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection());
+ (void) new TDEAction(i18n("&Encrypt File..."), "encrypted", 0,this, TQT_SLOT(slotFilePreEnc()), actionCollection(),"file_encrypt");
+ (void) new TDEAction(i18n("&Decrypt File..."), "decrypted", 0,this, TQT_SLOT(slotFilePreDec()), actionCollection(),"file_decrypt");
+ (void) new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,this, TQT_SLOT(slotKeyManager()), actionCollection(),"key_manage");
+ editUndo = KStdAction::undo(this, TQT_SLOT(slotundo()), actionCollection());
+ editRedo = KStdAction::redo(this, TQT_SLOT(slotredo()), actionCollection());
+ //(void) new TDEAction(i18n("&Manage Keys"), "kgpg_manage", CTRL+Key_K,this, TQT_SLOT(slotManageKey()), actionCollection(),"keys_manage");
+ (void) new TDEAction(i18n("&Generate Signature..."),0, this, TQT_SLOT(slotPreSignFile()), actionCollection(), "sign_generate");
+ (void) new TDEAction(i18n("&Verify Signature..."),0, this, TQT_SLOT(slotPreVerifyFile()), actionCollection(), "sign_verify");
+ (void) new TDEAction(i18n("&Check MD5 Sum..."), 0,this, TQT_SLOT(slotCheckMd5()), actionCollection(), "sign_check");
+ KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection());
// comment out for now, only confusing
//encodingAction=new TDEToggleAction(i18n("&Unicode (utf-8) Encoding"), 0, 0,this, TQT_SLOT(slotSetCharset()),actionCollection(),"charsets");
diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp
index 974949b..4e85f6b 100644
--- a/kgpg/kgpgview.cpp
+++ b/kgpg/kgpgview.cpp
@@ -134,7 +134,7 @@ TQFile qfile(fileToCheck);
} else {
KgpgInterface *importKeyProcess=new KgpgInterface();
importKeyProcess->importKeyURL(KURL(fileToCheck));
- connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),TQT_TQOBJECT(this),TQT_SLOT(slotProcessResult(TQStringList)));
+ connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),this,TQT_SLOT(slotProcessResult(TQStringList)));
return true;
}
} else {
@@ -172,8 +172,8 @@ void MyEditor::slotDecodeFile(TQString fname)
TQFile qfile(TQFile::encodeName(fname));
if (qfile.open(IO_ReadOnly)) {
KgpgInterface *txtDecrypt=new KgpgInterface();
- connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(editorUpdateDecryptedtxt(TQString)));
- connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfailed(TQString)),TQT_TQOBJECT(this),TQT_SLOT(editorFailedDecryptedtxt(TQString)));
+ connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfinished(TQString)),this,TQT_SLOT(editorUpdateDecryptedtxt(TQString)));
+ connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfailed(TQString)),this,TQT_SLOT(editorFailedDecryptedtxt(TQString)));
txtDecrypt->KgpgDecryptFileToText(KURL(fname),TQStringList::split(TQString(" "),KGpgSettings::customDecrypt().simplifyWhiteSpace()));
} else
KMessageBox::sorry(this,i18n("Unable to read file."));
@@ -208,11 +208,11 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name)
KButtonBox *boutonbox=new KButtonBox(this,TQt::Horizontal,15,12);
boutonbox->addStretch(1);
- bouton0=boutonbox->addButton(i18n("S&ign/Verify"),TQT_TQOBJECT(this),TQT_SLOT(clearSign()),TRUE);
- bouton1=boutonbox->addButton(i18n("En&crypt"),TQT_TQOBJECT(this),TQT_SLOT(popuppublic()),TRUE);
- bouton2=boutonbox->addButton(i18n("&Decrypt"),TQT_TQOBJECT(this),TQT_SLOT(slotdecode()),TRUE);
+ bouton0=boutonbox->addButton(i18n("S&ign/Verify"),this,TQT_SLOT(clearSign()),TRUE);
+ bouton1=boutonbox->addButton(i18n("En&crypt"),this,TQT_SLOT(popuppublic()),TRUE);
+ bouton2=boutonbox->addButton(i18n("&Decrypt"),this,TQT_SLOT(slotdecode()),TRUE);
- TQObject::connect(editor,TQT_SIGNAL(textChanged()),TQT_TQOBJECT(this),TQT_SLOT(modified()));
+ TQObject::connect(editor,TQT_SIGNAL(textChanged()),this,TQT_SLOT(modified()));
boutonbox->layout();
editor->resize(editor->maximumSize());
@@ -261,8 +261,8 @@ void KgpgView::clearSign()
if (mess.startsWith("-----BEGIN PGP SIGNED")) {
////////////////////// this is a signed message, verify it
KgpgInterface *verifyProcess=new KgpgInterface();
- connect(verifyProcess,TQT_SIGNAL(missingSignature(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotAskForImport(TQString)));
- connect(verifyProcess,TQT_SIGNAL(verifyOver(TQString,TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotVerifyResult(TQString,TQString)));
+ connect(verifyProcess,TQT_SIGNAL(missingSignature(TQString)),this,TQT_SLOT(slotAskForImport(TQString)));
+ connect(verifyProcess,TQT_SIGNAL(verifyOver(TQString,TQString)),this,TQT_SLOT(slotVerifyResult(TQString,TQString)));
verifyProcess->KgpgVerifyText(mess);
}
else {
@@ -280,7 +280,7 @@ void KgpgView::clearSign()
delete opts;
KgpgInterface *signProcess=new KgpgInterface();
- connect(signProcess,TQT_SIGNAL(txtSignOver(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotSignResult(TQString)));
+ connect(signProcess,TQT_SIGNAL(txtSignOver(TQString)),this,TQT_SLOT(slotSignResult(TQString)));
TQStringList options=NULL;
if (KGpgSettings::pgpCompatibility())
options<<"--pgp6";
@@ -312,7 +312,7 @@ void KgpgView::popuppublic()
//////// open dialog --> popuppublic.cpp
popupPublic *dialogue=new popupPublic(this, "public_keys", 0,false,((KgpgApp *) parent())->goDefaultKey);
- connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),TQT_TQOBJECT(this),TQT_SLOT(encodetxt(TQStringList,TQStringList,bool,bool)));
+ connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQT_SLOT(encodetxt(TQStringList,TQStringList,bool,bool)));
dialogue->exec();
delete dialogue;
}
@@ -329,8 +329,8 @@ void KgpgView::slotdecode()
//TQString resultat=KgpgInterface::KgpgDecryptText(editor->text(),encUsers);
KgpgInterface *txtDecrypt=new KgpgInterface();
- connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(updateDecryptedtxt(TQString)));
- connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfailed(TQString)),TQT_TQOBJECT(this),TQT_SLOT(failedDecryptedtxt(TQString)));
+ connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfinished(TQString)),this,TQT_SLOT(updateDecryptedtxt(TQString)));
+ connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfailed(TQString)),this,TQT_SLOT(failedDecryptedtxt(TQString)));
txtDecrypt->KgpgDecryptText(editor->text(),TQStringList::split(TQString(" "),KGpgSettings::customDecrypt().simplifyWhiteSpace()));
/*
@@ -371,7 +371,7 @@ void KgpgView::encodetxt(TQStringList selec,TQStringList encryptOptions,bool, bo
if (symmetric) selec.clear();
KgpgInterface *txtCrypt=new KgpgInterface();
- connect (txtCrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(updatetxt(TQString)));
+ connect (txtCrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),this,TQT_SLOT(updatetxt(TQString)));
txtCrypt->KgpgEncryptText(editor->text(),selec,encryptOptions);
//KMessageBox::sorry(0,"OVER");
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index 9a5207d..864bc4b 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -350,8 +350,8 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel)
{
KMessageBox::information(this,i18n("<qt><b>Some of your secret keys are untrusted.</b><br>Change their trust if you want to use them for signing.</qt>"),TQString(),"warnUntrusted");
}
- TQObject::connect(keysListpr,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),TQT_TQOBJECT(this),TQT_SLOT(slotpreOk()));
- TQObject::connect(keysListpr,TQT_SIGNAL(clicked(TQListViewItem *)),TQT_TQOBJECT(this),TQT_SLOT(slotSelect(TQListViewItem *)));
+ TQObject::connect(keysListpr,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(slotpreOk()));
+ TQObject::connect(keysListpr,TQT_SIGNAL(clicked(TQListViewItem *)),this,TQT_SLOT(slotSelect(TQListViewItem *)));
if (!selectedok)
@@ -460,7 +460,7 @@ KeyView::KeyView( TQWidget *parent, const char *name )
trustgood.fill(KGpgSettings::colorGood());//TQColor(144,255,0));
bitBlt(&trustgood,0,0,&blankFrame,0,0,50,15);
- connect(this,TQT_SIGNAL(expanded (TQListViewItem *)),TQT_TQOBJECT(this),TQT_SLOT(expandKey(TQListViewItem *)));
+ connect(this,TQT_SIGNAL(expanded (TQListViewItem *)),this,TQT_SLOT(expandKey(TQListViewItem *)));
header()->setMovingEnabled(false);
setAcceptDrops(true);
setDragEnabled(true);
@@ -476,7 +476,7 @@ void KeyView::droppedfile (KURL url)
KgpgInterface *importKeyProcess=new KgpgInterface();
importKeyProcess->importKeyURL(url);
- connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),TQT_TQOBJECT(this),TQT_SLOT(slotReloadKeys(TQStringList)));
+ connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),this,TQT_SLOT(slotReloadKeys(TQStringList)));
}
void KeyView::contentsDragMoveEvent(TQDragMoveEvent *e)
@@ -573,60 +573,60 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
installEventFilter(this);
setCaption(i18n("Key Management"));
- (void) new TDEAction(i18n("&Open Editor"), "edit",0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor");
- TDEAction *exportPublicKey = new TDEAction(i18n("E&xport Public Keys..."), "kgpg_export", TDEStdAccel::shortcut(TDEStdAccel::Copy),TQT_TQOBJECT(this), TQT_SLOT(slotexport()),actionCollection(),"key_export");
- TDEAction *deleteKey = new TDEAction(i18n("&Delete Keys"),"edit-delete", TQt::Key_Delete,TQT_TQOBJECT(this), TQT_SLOT(confirmdeletekey()),actionCollection(),"key_delete");
- signKey = new TDEAction(i18n("&Sign Keys..."), "kgpg_sign", 0,TQT_TQOBJECT(this), TQT_SLOT(signkey()),actionCollection(),"key_sign");
- TDEAction *delSignKey = new TDEAction(i18n("Delete Sign&ature"),"edit-delete", 0,TQT_TQOBJECT(this), TQT_SLOT(delsignkey()),actionCollection(),"key_delsign");
- TDEAction *infoKey = new TDEAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,TQT_TQOBJECT(this), TQT_SLOT(listsigns()),actionCollection(),"key_info");
- TDEAction *importKey = new TDEAction(i18n("&Import Key..."), "kgpg_import", TDEStdAccel::shortcut(TDEStdAccel::Paste),TQT_TQOBJECT(this), TQT_SLOT(slotPreImportKey()),actionCollection(),"key_import");
- TDEAction *setDefaultKey = new TDEAction(i18n("Set as De&fault Key"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotSetDefKey()),actionCollection(),"key_default");
- importSignatureKey = new TDEAction(i18n("Import Key From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(preimportsignkey()),actionCollection(),"key_importsign");
- importAllSignKeys = new TDEAction(i18n("Import &Missing Signatures From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(importallsignkey()),actionCollection(),"key_importallsign");
- refreshKey = new TDEAction(i18n("&Refresh Keys From Keyserver"),"reload", 0,TQT_TQOBJECT(this), TQT_SLOT(refreshKeyFromServer()),actionCollection(),"key_server_refresh");
-
- TDEAction *createGroup=new TDEAction(i18n("&Create Group with Selected Keys..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(createNewGroup()),actionCollection(),"create_group");
- TDEAction *delGroup= new TDEAction(i18n("&Delete Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteGroup()),actionCollection(),"delete_group");
- TDEAction *editCurrentGroup= new TDEAction(i18n("&Edit Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(editGroup()),actionCollection(),"edit_group");
-
- TDEAction *newContact=new TDEAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,TQT_TQOBJECT(this), TQT_SLOT(addToKAB()),actionCollection(),"add_kab");
- (void) new TDEAction(i18n("&Go to Default Key"), "go-home",TQKeySequence(CTRL+TQt::Key_Home) ,TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key");
-
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitApp()), actionCollection());
- KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(findKey()), actionCollection());
- KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(findNextKey()), actionCollection());
- (void) new TDEAction(i18n("&Refresh List"), "reload", TDEStdAccel::reload(),TQT_TQOBJECT(this), TQT_SLOT(refreshkey()),actionCollection(),"key_refresh");
- TDEAction *openPhoto= new TDEAction(i18n("&Open Photo"), "image-x-generic", 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowPhoto()),actionCollection(),"key_photo");
- TDEAction *deletePhoto= new TDEAction(i18n("&Delete Photo"), "delete", 0,TQT_TQOBJECT(this), TQT_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo");
- TDEAction *addPhoto= new TDEAction(i18n("&Add Photo"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddPhoto()),actionCollection(),"add_photo");
-
- TDEAction *addUid= new TDEAction(i18n("&Add User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddUid()),actionCollection(),"add_uid");
- TDEAction *delUid= new TDEAction(i18n("&Delete User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotDelUid()),actionCollection(),"del_uid");
-
- TDEAction *editKey = new TDEAction(i18n("Edit Key in &Terminal"), "kgpg_term", TQKeySequence(ALT+TQt::Key_Return),TQT_TQOBJECT(this), TQT_SLOT(slotedit()),actionCollection(),"key_edit");
- TDEAction *exportSecretKey = new TDEAction(i18n("Export Secret Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotexportsec()),actionCollection(),"key_sexport");
- TDEAction *revokeKey = new TDEAction(i18n("Revoke Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(revokeWidget()),actionCollection(),"key_revoke");
-
- TDEAction *deleteKeyPair = new TDEAction(i18n("Delete Key Pair"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteseckey()),actionCollection(),"key_pdelete");
- TDEAction *generateKey = new TDEAction(i18n("&Generate Key Pair..."), "kgpg_gen", TDEStdAccel::shortcut(TDEStdAccel::New),TQT_TQOBJECT(this), TQT_SLOT(slotgenkey()),actionCollection(),"key_gener");
-
- TDEAction *regeneratePublic = new TDEAction(i18n("&Regenerate Public Key"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotregenerate()),actionCollection(),"key_regener");
-
- (void) new TDEAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(showKeyServer()),actionCollection(),"key_server");
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection(),"options_configure");
- (void) new TDEAction(i18n("Tip of the &Day"), "idea", 0,TQT_TQOBJECT(this), TQT_SLOT(slotTip()), actionCollection(),"help_tipofday");
- (void) new TDEAction(i18n("View GnuPG Manual"), "contents", 0,TQT_TQOBJECT(this), TQT_SLOT(slotManpage()),actionCollection(),"gpg_man");
-
- (void) new TDEToggleAction(i18n("&Show only Secret Keys"), "kgpg_show", 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleSecret()),actionCollection(),"show_secret");
+ (void) new TDEAction(i18n("&Open Editor"), "edit",0,this, TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor");
+ TDEAction *exportPublicKey = new TDEAction(i18n("E&xport Public Keys..."), "kgpg_export", TDEStdAccel::shortcut(TDEStdAccel::Copy),this, TQT_SLOT(slotexport()),actionCollection(),"key_export");
+ TDEAction *deleteKey = new TDEAction(i18n("&Delete Keys"),"edit-delete", TQt::Key_Delete,this, TQT_SLOT(confirmdeletekey()),actionCollection(),"key_delete");
+ signKey = new TDEAction(i18n("&Sign Keys..."), "kgpg_sign", 0,this, TQT_SLOT(signkey()),actionCollection(),"key_sign");
+ TDEAction *delSignKey = new TDEAction(i18n("Delete Sign&ature"),"edit-delete", 0,this, TQT_SLOT(delsignkey()),actionCollection(),"key_delsign");
+ TDEAction *infoKey = new TDEAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,this, TQT_SLOT(listsigns()),actionCollection(),"key_info");
+ TDEAction *importKey = new TDEAction(i18n("&Import Key..."), "kgpg_import", TDEStdAccel::shortcut(TDEStdAccel::Paste),this, TQT_SLOT(slotPreImportKey()),actionCollection(),"key_import");
+ TDEAction *setDefaultKey = new TDEAction(i18n("Set as De&fault Key"),0, 0,this, TQT_SLOT(slotSetDefKey()),actionCollection(),"key_default");
+ importSignatureKey = new TDEAction(i18n("Import Key From Keyserver"),"network", 0,this, TQT_SLOT(preimportsignkey()),actionCollection(),"key_importsign");
+ importAllSignKeys = new TDEAction(i18n("Import &Missing Signatures From Keyserver"),"network", 0,this, TQT_SLOT(importallsignkey()),actionCollection(),"key_importallsign");
+ refreshKey = new TDEAction(i18n("&Refresh Keys From Keyserver"),"reload", 0,this, TQT_SLOT(refreshKeyFromServer()),actionCollection(),"key_server_refresh");
+
+ TDEAction *createGroup=new TDEAction(i18n("&Create Group with Selected Keys..."), 0, 0,this, TQT_SLOT(createNewGroup()),actionCollection(),"create_group");
+ TDEAction *delGroup= new TDEAction(i18n("&Delete Group"), 0, 0,this, TQT_SLOT(deleteGroup()),actionCollection(),"delete_group");
+ TDEAction *editCurrentGroup= new TDEAction(i18n("&Edit Group"), 0, 0,this, TQT_SLOT(editGroup()),actionCollection(),"edit_group");
+
+ TDEAction *newContact=new TDEAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,this, TQT_SLOT(addToKAB()),actionCollection(),"add_kab");
+ (void) new TDEAction(i18n("&Go to Default Key"), "go-home",TQKeySequence(CTRL+TQt::Key_Home) ,this, TQT_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key");
+
+ KStdAction::quit(this, TQT_SLOT(quitApp()), actionCollection());
+ KStdAction::find(this, TQT_SLOT(findKey()), actionCollection());
+ KStdAction::findNext(this, TQT_SLOT(findNextKey()), actionCollection());
+ (void) new TDEAction(i18n("&Refresh List"), "reload", TDEStdAccel::reload(),this, TQT_SLOT(refreshkey()),actionCollection(),"key_refresh");
+ TDEAction *openPhoto= new TDEAction(i18n("&Open Photo"), "image-x-generic", 0,this, TQT_SLOT(slotShowPhoto()),actionCollection(),"key_photo");
+ TDEAction *deletePhoto= new TDEAction(i18n("&Delete Photo"), "delete", 0,this, TQT_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo");
+ TDEAction *addPhoto= new TDEAction(i18n("&Add Photo"), 0, 0,this, TQT_SLOT(slotAddPhoto()),actionCollection(),"add_photo");
+
+ TDEAction *addUid= new TDEAction(i18n("&Add User Id"), 0, 0,this, TQT_SLOT(slotAddUid()),actionCollection(),"add_uid");
+ TDEAction *delUid= new TDEAction(i18n("&Delete User Id"), 0, 0,this, TQT_SLOT(slotDelUid()),actionCollection(),"del_uid");
+
+ TDEAction *editKey = new TDEAction(i18n("Edit Key in &Terminal"), "kgpg_term", TQKeySequence(ALT+TQt::Key_Return),this, TQT_SLOT(slotedit()),actionCollection(),"key_edit");
+ TDEAction *exportSecretKey = new TDEAction(i18n("Export Secret Key..."), 0, 0,this, TQT_SLOT(slotexportsec()),actionCollection(),"key_sexport");
+ TDEAction *revokeKey = new TDEAction(i18n("Revoke Key..."), 0, 0,this, TQT_SLOT(revokeWidget()),actionCollection(),"key_revoke");
+
+ TDEAction *deleteKeyPair = new TDEAction(i18n("Delete Key Pair"), 0, 0,this, TQT_SLOT(deleteseckey()),actionCollection(),"key_pdelete");
+ TDEAction *generateKey = new TDEAction(i18n("&Generate Key Pair..."), "kgpg_gen", TDEStdAccel::shortcut(TDEStdAccel::New),this, TQT_SLOT(slotgenkey()),actionCollection(),"key_gener");
+
+ TDEAction *regeneratePublic = new TDEAction(i18n("&Regenerate Public Key"), 0, 0,this, TQT_SLOT(slotregenerate()),actionCollection(),"key_regener");
+
+ (void) new TDEAction(i18n("&Key Server Dialog"), "network", 0,this, TQT_SLOT(showKeyServer()),actionCollection(),"key_server");
+ KStdAction::preferences(this, TQT_SLOT(showOptions()), actionCollection(),"options_configure");
+ (void) new TDEAction(i18n("Tip of the &Day"), "idea", 0,this, TQT_SLOT(slotTip()), actionCollection(),"help_tipofday");
+ (void) new TDEAction(i18n("View GnuPG Manual"), "contents", 0,this, TQT_SLOT(slotManpage()),actionCollection(),"gpg_man");
+
+ (void) new TDEToggleAction(i18n("&Show only Secret Keys"), "kgpg_show", 0,this, TQT_SLOT(slotToggleSecret()),actionCollection(),"show_secret");
keysList2->displayOnlySecret=false;
- (void) new TDEToggleAction(i18n("&Hide Expired/Disabled Keys"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled");
+ (void) new TDEToggleAction(i18n("&Hide Expired/Disabled Keys"),0, 0,this, TQT_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled");
keysList2->displayDisabled=true;
- sTrust=new TDEToggleAction(i18n("Trust"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowTrust()),actionCollection(),"show_trust");
- sSize=new TDEToggleAction(i18n("Size"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowSize()),actionCollection(),"show_size");
- sCreat=new TDEToggleAction(i18n("Creation"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowCreat()),actionCollection(),"show_creat");
- sExpi=new TDEToggleAction(i18n("Expiration"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowExpi()),actionCollection(),"show_expi");
+ sTrust=new TDEToggleAction(i18n("Trust"),0, 0,this, TQT_SLOT(slotShowTrust()),actionCollection(),"show_trust");
+ sSize=new TDEToggleAction(i18n("Size"),0, 0,this, TQT_SLOT(slotShowSize()),actionCollection(),"show_size");
+ sCreat=new TDEToggleAction(i18n("Creation"),0, 0,this, TQT_SLOT(slotShowCreat()),actionCollection(),"show_creat");
+ sExpi=new TDEToggleAction(i18n("Expiration"),0, 0,this, TQT_SLOT(slotShowExpi()),actionCollection(),"show_expi");
photoProps = new TDESelectAction(i18n("&Photo ID's"),"kgpg_photo", actionCollection(), "photo_settings");
@@ -722,12 +722,12 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
setCentralWidget(keysList2);
keysList2->restoreLayout(TDEGlobal::config(), "KeyView");
- TQObject::connect(keysList2,TQT_SIGNAL(returnPressed(TQListViewItem *)),TQT_TQOBJECT(this),TQT_SLOT(listsigns()));
- TQObject::connect(keysList2,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),TQT_TQOBJECT(this),TQT_SLOT(listsigns()));
- TQObject::connect(keysList2,TQT_SIGNAL(selectionChanged ()),TQT_TQOBJECT(this),TQT_SLOT(checkList()));
+ TQObject::connect(keysList2,TQT_SIGNAL(returnPressed(TQListViewItem *)),this,TQT_SLOT(listsigns()));
+ TQObject::connect(keysList2,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(listsigns()));
+ TQObject::connect(keysList2,TQT_SIGNAL(selectionChanged ()),this,TQT_SLOT(checkList()));
TQObject::connect(keysList2,TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)),
this,TQT_SLOT(slotmenu(TQListViewItem *,const TQPoint &,int)));
- TQObject::connect(keysList2,TQT_SIGNAL(destroyed()),TQT_TQOBJECT(this),TQT_SLOT(annule()));
+ TQObject::connect(keysList2,TQT_SIGNAL(destroyed()),this,TQT_SLOT(annule()));
/////////////// get all keys data
@@ -742,10 +742,10 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
: "locationbar_erase"));
(void) new TQLabel(i18n("Search: "),toolBar());
listViewSearch = new mySearchLine(toolBar(),keysList2);
- connect(clearSearch, TQT_SIGNAL(pressed()), TQT_TQOBJECT(listViewSearch), TQT_SLOT(clear()));
+ connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
- (void)new TDEAction(i18n("Filter Search"), TQt::Key_F6, TQT_TQOBJECT(listViewSearch), TQT_SLOT(setFocus()),actionCollection(), "search_focus");
+ (void)new TDEAction(i18n("Filter Search"), TQt::Key_F6, listViewSearch, TQT_SLOT(setFocus()),actionCollection(), "search_focus");
sTrust->setChecked(KGpgSettings::showTrust());
sSize->setChecked(KGpgSettings::showSize());
@@ -758,8 +758,8 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
keyStatusBar->insertFixedItem(i18n("00000 Keys, 000 Groups"),1,true);
keyStatusBar->setItemAlignment(0, AlignLeft);
keyStatusBar->changeItem("",1);
- TQObject::connect(keysList2,TQT_SIGNAL(statusMessage(TQString,int,bool)),TQT_TQOBJECT(this),TQT_SLOT(changeMessage(TQString,int,bool)));
- TQObject::connect(statusbarTimer,TQT_SIGNAL(timeout()),TQT_TQOBJECT(this),TQT_SLOT(statusBarTimeout()));
+ TQObject::connect(keysList2,TQT_SIGNAL(statusMessage(TQString,int,bool)),this,TQT_SLOT(changeMessage(TQString,int,bool)));
+ TQObject::connect(statusbarTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(statusBarTimeout()));
s_kgpgEditor= new KgpgApp(parent, "editor",WType_Dialog,actionCollection()->action("go_default_key")->shortcut(),true);
connect(s_kgpgEditor,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList)));
@@ -782,7 +782,7 @@ void listKeys::slotOpenEditor()
{
KgpgApp *kgpgtxtedit = new KgpgApp(this, "editor",WType_TopLevel | WDestructiveClose,actionCollection()->action("go_default_key")->shortcut());
connect(kgpgtxtedit,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList)));
- connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),TQT_TQOBJECT(this),TQT_SIGNAL(encryptFiles(KURL::List)));
+ connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),this,TQT_SIGNAL(encryptFiles(KURL::List)));
connect(this,TQT_SIGNAL(fontChanged(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont)));
connect(kgpgtxtedit->view->editor,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList)));
kgpgtxtedit->show();
@@ -970,13 +970,13 @@ void listKeys::slotAddUid()
addUidWidget->setMainWidget(keyUid);
//keyUid->setMinimumSize(keyUid->sizeHint());
keyUid->setMinimumWidth(300);
- connect(keyUid->kLineEdit1,TQT_SIGNAL(textChanged ( const TQString & )),TQT_TQOBJECT(this),TQT_SLOT(slotAddUidEnable(const TQString & )));
+ connect(keyUid->kLineEdit1,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(slotAddUidEnable(const TQString & )));
if (addUidWidget->exec()!=TQDialog::Accepted)
return;
KgpgInterface *addUidProcess=new KgpgInterface();
addUidProcess->KgpgAddUid(keysList2->currentItem()->text(6),keyUid->kLineEdit1->text(),keyUid->kLineEdit2->text(),keyUid->kLineEdit3->text());
connect(addUidProcess,TQT_SIGNAL(addUidFinished()),keysList2,TQT_SLOT(refreshselfkey()));
- connect(addUidProcess,TQT_SIGNAL(addUidError(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotGpgError(TQString)));
+ connect(addUidProcess,TQT_SIGNAL(addUidError(TQString)),this,TQT_SLOT(slotGpgError(TQString)));
}
void listKeys::slotAddUidEnable(const TQString & name)
@@ -999,8 +999,8 @@ void listKeys::slotAddPhoto()
return;
KgpgInterface *addPhotoProcess=new KgpgInterface();
addPhotoProcess->KgpgAddPhoto(keysList2->currentItem()->text(6),imagePath);
- connect(addPhotoProcess,TQT_SIGNAL(addPhotoFinished()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdatePhoto()));
- connect(addPhotoProcess,TQT_SIGNAL(addPhotoError(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotGpgError(TQString)));
+ connect(addPhotoProcess,TQT_SIGNAL(addPhotoFinished()),this,TQT_SLOT(slotUpdatePhoto()));
+ connect(addPhotoProcess,TQT_SIGNAL(addPhotoError(TQString)),this,TQT_SLOT(slotGpgError(TQString)));
}
void listKeys::slotGpgError(TQString errortxt)
@@ -1016,8 +1016,8 @@ void listKeys::slotDeletePhoto()
KgpgInterface *delPhotoProcess=new KgpgInterface();
delPhotoProcess->KgpgDeletePhoto(keysList2->currentItem()->parent()->text(6),keysList2->currentItem()->text(6));
- connect(delPhotoProcess,TQT_SIGNAL(delPhotoFinished()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdatePhoto()));
- connect(delPhotoProcess,TQT_SIGNAL(delPhotoError(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotGpgError(TQString)));
+ connect(delPhotoProcess,TQT_SIGNAL(delPhotoFinished()),this,TQT_SLOT(slotUpdatePhoto()));
+ connect(delPhotoProcess,TQT_SIGNAL(delPhotoError(TQString)),this,TQT_SLOT(slotGpgError(TQString)));
}
void listKeys::slotUpdatePhoto()
@@ -1338,12 +1338,12 @@ void listKeys::showOptions()
if (TDEConfigDialog::showDialog("settings"))
return;
kgpgOptions *optionsDialog=new kgpgOptions(this,"settings");
- connect(optionsDialog,TQT_SIGNAL(settingsUpdated()),TQT_TQOBJECT(this),TQT_SLOT(readAllOptions()));
- connect(optionsDialog,TQT_SIGNAL(homeChanged()),TQT_TQOBJECT(this),TQT_SLOT(refreshkey()));
- connect(optionsDialog,TQT_SIGNAL(reloadKeyList()),TQT_TQOBJECT(this),TQT_SLOT(refreshkey()));
+ connect(optionsDialog,TQT_SIGNAL(settingsUpdated()),this,TQT_SLOT(readAllOptions()));
+ connect(optionsDialog,TQT_SIGNAL(homeChanged()),this,TQT_SLOT(refreshkey()));
+ connect(optionsDialog,TQT_SIGNAL(reloadKeyList()),this,TQT_SLOT(refreshkey()));
connect(optionsDialog,TQT_SIGNAL(refreshTrust(int,TQColor)),keysList2,TQT_SLOT(refreshTrust(int,TQColor)));
- connect(optionsDialog,TQT_SIGNAL(changeFont(TQFont)),TQT_TQOBJECT(this),TQT_SIGNAL(fontChanged(TQFont)));
- connect(optionsDialog,TQT_SIGNAL(installShredder()),TQT_TQOBJECT(this),TQT_SIGNAL(installShredder()));
+ connect(optionsDialog,TQT_SIGNAL(changeFont(TQFont)),this,TQT_SIGNAL(fontChanged(TQFont)));
+ connect(optionsDialog,TQT_SIGNAL(installShredder()),this,TQT_SIGNAL(installShredder()));
optionsDialog->exec();
delete optionsDialog;
}
@@ -1476,15 +1476,15 @@ void listKeys::revokeWidget()
if (keyRevoke->cbSave->isChecked()) {
slotrevoke(keysList2->currentItem()->text(6),keyRevoke->kURLRequester1->url(),keyRevoke->comboBox1->currentItem(),keyRevoke->textDescription->text());
if (keyRevoke->cbPrint->isChecked())
- connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),TQT_TQOBJECT(this),TQT_SLOT(doFilePrint(TQString)));
+ connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),this,TQT_SLOT(doFilePrint(TQString)));
if (keyRevoke->cbImport->isChecked())
- connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotImportRevoke(TQString)));
+ connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),this,TQT_SLOT(slotImportRevoke(TQString)));
} else {
slotrevoke(keysList2->currentItem()->text(6),TQString(),keyRevoke->comboBox1->currentItem(),keyRevoke->textDescription->text());
if (keyRevoke->cbPrint->isChecked())
- connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),TQT_TQOBJECT(this),TQT_SLOT(doPrint(TQString)));
+ connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),this,TQT_SLOT(doPrint(TQString)));
if (keyRevoke->cbImport->isChecked())
- connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotImportRevokeTxt(TQString)));
+ connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),this,TQT_SLOT(slotImportRevokeTxt(TQString)));
}
}
@@ -1623,10 +1623,10 @@ void listKeys::slotexport()
TQString result=kexp->getKey(tdelist,exportAttr);
if (page->checkClipboard->isChecked())
slotProcessExportClip(result);
- //connect(kexp,TQT_SIGNAL(publicKeyString(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotProcessExportClip(TQString)));
+ //connect(kexp,TQT_SIGNAL(publicKeyString(TQString)),this,TQT_SLOT(slotProcessExportClip(TQString)));
else
slotProcessExportMail(result);
- //connect(kexp,TQT_SIGNAL(publicKeyString(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotProcessExportMail(TQString)));
+ //connect(kexp,TQT_SIGNAL(publicKeyString(TQString)),this,TQT_SLOT(slotProcessExportMail(TQString)));
}
}
@@ -1848,11 +1848,11 @@ void listKeys::editGroup()
gEdit->buttonAdd->setPixmap(TDEGlobal::iconLoader()->loadIcon("go-down",TDEIcon::Small,20));
gEdit->buttonRemove->setPixmap(TDEGlobal::iconLoader()->loadIcon("go-up",TDEIcon::Small,20));
- connect(gEdit->buttonAdd,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupAdd()));
- connect(gEdit->buttonRemove,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupRemove()));
- // connect(dialogGroupEdit->okClicked(),TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupChange()));
- connect(gEdit->availableKeys,TQT_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),TQT_TQOBJECT(this),TQT_SLOT(groupAdd()));
- connect(gEdit->groupKeys,TQT_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),TQT_TQOBJECT(this),TQT_SLOT(groupRemove()));
+ connect(gEdit->buttonAdd,TQT_SIGNAL(clicked()),this,TQT_SLOT(groupAdd()));
+ connect(gEdit->buttonRemove,TQT_SIGNAL(clicked()),this,TQT_SLOT(groupRemove()));
+ // connect(dialogGroupEdit->okClicked(),TQT_SIGNAL(clicked()),this,TQT_SLOT(groupChange()));
+ connect(gEdit->availableKeys,TQT_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),this,TQT_SLOT(groupAdd()));
+ connect(gEdit->groupKeys,TQT_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),this,TQT_SLOT(groupRemove()));
TQListViewItem *item=keysList2->firstChild();
if (item==NULL)
return;
@@ -2024,7 +2024,7 @@ void listKeys::signLoop()
// kdDebug(2100)<<"Sign process for key: "<<keyCount<<" on a total of "<<signList.count()<<endl;
if ( signList.at(keyCount) ) {
KgpgInterface *signKeyProcess=new KgpgInterface();
- TQObject::connect(signKeyProcess,TQT_SIGNAL(signatureFinished(int)),TQT_TQOBJECT(this),TQT_SLOT(signatureResult(int)));
+ TQObject::connect(signKeyProcess,TQT_SIGNAL(signatureFinished(int)),this,TQT_SLOT(signatureResult(int)));
signKeyProcess->KgpgSignKey(signList.at(keyCount)->text(6),globalkeyID,globalkeyMail,globalisLocal,globalChecked);
}
}
@@ -2164,7 +2164,7 @@ void listKeys::delsignkey()
return;
KgpgInterface *delSignKeyProcess=new KgpgInterface();
delSignKeyProcess->KgpgDelSignature(parentKey,signID);
- connect(delSignKeyProcess,TQT_SIGNAL(delsigfinished(bool)),TQT_TQOBJECT(this),TQT_SLOT(delsignatureResult(bool)));
+ connect(delSignKeyProcess,TQT_SIGNAL(delsigfinished(bool)),this,TQT_SLOT(delsignatureResult(bool)));
}
void listKeys::delsignatureResult(bool success)
@@ -2272,7 +2272,7 @@ void listKeys::slotgenkey()
//*proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--batch"<<"--passphrase-fd"<<res<<"--gen-key"<<"-a"<<"kgpg.tmp";
*proc<<"gpg"<<"--no-tty"<<"--status-fd=2"<<"--no-secmem-warning"<<"--batch"<<"--gen-key"<<"--utf8-strings";
///////// when process ends, update dialog infos
- TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(genover(TDEProcess *)));
+ TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(genover(TDEProcess *)));
proc->start(TDEProcess::NotifyOnExit,true);
if (ktype=="RSA")
@@ -2303,7 +2303,7 @@ void listKeys::slotgenkey()
if (kexp==4)
proc->writeStdin(TQString("Expire-Date:%1y").arg(knumb));
proc->writeStdin(TQString("%commit"));
- TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this),TQT_SLOT(readgenprocess(KProcIO *)));
+ TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readgenprocess(KProcIO *)));
proc->closeWhenDone();
} else ////// start expert (=konsole) mode
{
@@ -2346,8 +2346,8 @@ void listKeys::genover(TDEProcess *)
<<"--with-colons"
<< fpropt
<<"--list-keys"<<newKeyName;
- TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),TQT_TQOBJECT(this),TQT_SLOT(slotReadFingerProcess(KProcIO *)));
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(newKeyDone(TDEProcess *)));
+ TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(slotReadFingerProcess(KProcIO *)));
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(newKeyDone(TDEProcess *)));
conprocess->start(TDEProcess::NotifyOnExit,true);
}
@@ -2413,10 +2413,10 @@ void listKeys::newKeyDone(TDEProcess *)
if (page->CBsave->isChecked()) {
slotrevoke(newkeyID,page->kURLRequester1->url(),0,i18n("backup copy"));
if (page->CBprint->isChecked())
- connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),TQT_TQOBJECT(this),TQT_SLOT(doFilePrint(TQString)));
+ connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),this,TQT_SLOT(doFilePrint(TQString)));
} else if (page->CBprint->isChecked()) {
slotrevoke(newkeyID,TQString(),0,i18n("backup copy"));
- connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),TQT_TQOBJECT(this),TQT_SLOT(doPrint(TQString)));
+ connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),this,TQT_SLOT(doPrint(TQString)));
}
}
@@ -2460,7 +2460,7 @@ void listKeys::deleteseckey()
*conprocess<< config->readPathEntry("TerminalApplication","konsole");
*conprocess<<"-e"<<"gpg" <<"--no-secmem-warning"
<<"--delete-secret-key"<<keysList2->currentItem()->text(6);
- TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),TQT_TQOBJECT(this), TQT_SLOT(reloadSecretKeys()));
+ TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(reloadSecretKeys()));
conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput);
}
diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp
index a3e0847..1c4ac98 100644
--- a/kgpg/popuppublic.cpp
+++ b/kgpg/popuppublic.cpp
@@ -150,7 +150,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
boutonboxoptions=new TQButtonGroup(5,TQt::Vertical ,page,0);
TDEActionCollection *actcol=new TDEActionCollection(this);
- (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key");
+ (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, this, TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key");
CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions);
diff --git a/khexedit/bitswapwidget.cpp b/khexedit/bitswapwidget.cpp
index bc6da80..dc17ea1 100644
--- a/khexedit/bitswapwidget.cpp
+++ b/khexedit/bitswapwidget.cpp
@@ -56,7 +56,7 @@ void CDigitLabel::setValue( uint digit, bool notify )
{
if( notify == true )
{
- emit valueChanged( TQT_TQOBJECT(this), digit, false );
+ emit valueChanged( this, digit, false );
}
mDigit = digit;
@@ -64,7 +64,7 @@ void CDigitLabel::setValue( uint digit, bool notify )
if( notify == true )
{
- emit valueChanged( TQT_TQOBJECT(this), mDigit, true );
+ emit valueChanged( this, mDigit, true );
}
}
}
@@ -145,12 +145,12 @@ void CDigitLabel::keyPressEvent( TQKeyEvent *e )
{
case Key_Left:
case Key_Up:
- emit stepCell( TQT_TQOBJECT(this), false );
+ emit stepCell( this, false );
break;
case Key_Right:
case Key_Down:
- emit stepCell( TQT_TQOBJECT(this), true );
+ emit stepCell( this, true );
break;
case Key_Escape:
diff --git a/khexedit/fileinfodialog.cpp b/khexedit/fileinfodialog.cpp
index 96fb060..9d240e0 100644
--- a/khexedit/fileinfodialog.cpp
+++ b/khexedit/fileinfodialog.cpp
@@ -321,7 +321,7 @@ void CFileInfoDialog::showEvent( TQShowEvent *e )
void CFileInfoDialog::timerEvent( TQTimerEvent * )
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
slotUser1();
}
diff --git a/khexedit/hexvalidator.cpp b/khexedit/hexvalidator.cpp
index 74126e7..96cd982 100644
--- a/khexedit/hexvalidator.cpp
+++ b/khexedit/hexvalidator.cpp
@@ -25,7 +25,7 @@
CHexValidator::CHexValidator( TQWidget *parent, EState state,
const char *name )
- :TQValidator( TQT_TQOBJECT(parent), name )
+ :TQValidator( parent, name )
{
setState( state );
}
diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp
index e23e26a..0acab5c 100644
--- a/khexedit/parts/kpart/khepart.cpp
+++ b/khexedit/parts/kpart/khepart.cpp
@@ -83,7 +83,7 @@ void KHexEditPart::setupActions( bool BrowserViewWanted )
{
TDEActionCollection *AC = actionCollection();
// create our actions
- CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( TQT_TQOBJECT(HexEdit), TQT_SLOT(copy()), AC );
+ CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( HexEdit, TQT_SLOT(copy()), AC );
KStdAction::selectAll( this, TQT_SLOT(slotSelectAll()), AC );
KStdAction::deselect( this, TQT_SLOT(slotUnselect()), AC );
@@ -105,8 +105,8 @@ void KHexEditPart::setupActions( bool BrowserViewWanted )
ShowUnprintableAction = new TDEToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQT_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" );
- KStdAction::zoomIn( TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomIn()), actionCollection() );
- KStdAction::zoomOut( TQT_TQOBJECT(HexEdit), TQT_SLOT(zoomOut()), actionCollection() );
+ KStdAction::zoomIn( HexEdit, TQT_SLOT(zoomIn()), actionCollection() );
+ KStdAction::zoomOut( HexEdit, TQT_SLOT(zoomOut()), actionCollection() );
// resize style
ResizeStyleAction = new TDESelectAction( i18n("&Resize Style"), 0, AC, "resizestyle" );
diff --git a/khexedit/stringdialog.cpp b/khexedit/stringdialog.cpp
index f1c79f4..5cab7eb 100644
--- a/khexedit/stringdialog.cpp
+++ b/khexedit/stringdialog.cpp
@@ -270,14 +270,14 @@ void CStringDialog::setClean( void )
void CStringDialog::selectionChanged()
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
startTimer( 200 );
}
void CStringDialog::timerEvent( TQTimerEvent * )
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
TQListViewItem *item = mStringList->currentItem();
if( item == 0 )
diff --git a/khexedit/toplevel.cpp b/khexedit/toplevel.cpp
index c09bef8..b462b5a 100644
--- a/khexedit/toplevel.cpp
+++ b/khexedit/toplevel.cpp
@@ -65,43 +65,43 @@ KHexEdit::KHexEdit( void )
//
// Prepare menus and status bar
//
- mAction.bookmarkMapper = new TQSignalMapper(TQT_TQOBJECT(this));
- connect(mAction.bookmarkMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(editor()), TQT_SLOT(gotoBookmark(int)));
+ mAction.bookmarkMapper = new TQSignalMapper(this);
+ connect(mAction.bookmarkMapper, TQT_SIGNAL(mapped(int)), editor(), TQT_SLOT(gotoBookmark(int)));
setupActions();
setupStatusBar();
connect( hexView(), TQT_SIGNAL( cursorChanged( SCursorState & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( cursorChanged( SCursorState & ) ) );
+ this, TQT_SLOT( cursorChanged( SCursorState & ) ) );
connect( hexView(), TQT_SIGNAL( editMode( CHexBuffer::EEditMode ) ),
- TQT_TQOBJECT(this), TQT_SLOT( editMode( CHexBuffer::EEditMode ) ) );
+ this, TQT_SLOT( editMode( CHexBuffer::EEditMode ) ) );
connect( hexView(), TQT_SIGNAL( encodingChanged( const SEncodeState &)),
- TQT_TQOBJECT(this), TQT_SLOT( encodingChanged( const SEncodeState & )) );
+ this, TQT_SLOT( encodingChanged( const SEncodeState & )) );
connect( hexView(), TQT_SIGNAL( textWidth( uint ) ),
- TQT_TQOBJECT(this), TQT_SLOT( textWidth( uint ) ) );
+ this, TQT_SLOT( textWidth( uint ) ) );
connect( hexView(), TQT_SIGNAL( fileState( SFileState & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( fileState( SFileState & ) ) );
+ this, TQT_SLOT( fileState( SFileState & ) ) );
connect( hexView(), TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) );
+ this, TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) );
connect( hexView(), TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) );
+ this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) );
connect( hexView(), TQT_SIGNAL( bookmarkChanged( TQPtrList<SCursorOffset> &)),
- TQT_TQOBJECT(this), TQT_SLOT( bookmarkChanged( TQPtrList<SCursorOffset> & ) ) );
+ this, TQT_SLOT( bookmarkChanged( TQPtrList<SCursorOffset> & ) ) );
connect( hexView(), TQT_SIGNAL( fileName( const TQString &, bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( fileActive( const TQString &, bool ) ) );
+ this, TQT_SLOT( fileActive( const TQString &, bool ) ) );
connect( hexView(), TQT_SIGNAL( fileRename( const TQString &, const TQString & )),
- TQT_TQOBJECT(this), TQT_SLOT( fileRename( const TQString &, const TQString & ) ) );
+ this, TQT_SLOT( fileRename( const TQString &, const TQString & ) ) );
connect( hexView(), TQT_SIGNAL( fileClosed( const TQString & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( fileClosed( const TQString & ) ) );
- connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( errorLoadFile( const TQString & ) ),
- TQT_TQOBJECT(this), TQT_SLOT( removeRecentFile( const TQString & ) ) );
- connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( operationChanged( bool ) ),
- TQT_TQOBJECT(this), TQT_SLOT( operationChanged( bool ) ) );
- connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( removeRecentFiles() ),
- TQT_TQOBJECT(this), TQT_SLOT( removeRecentFiles() ) );
+ this, TQT_SLOT( fileClosed( const TQString & ) ) );
+ connect( editor(), TQT_SIGNAL( errorLoadFile( const TQString & ) ),
+ this, TQT_SLOT( removeRecentFile( const TQString & ) ) );
+ connect( editor(), TQT_SIGNAL( operationChanged( bool ) ),
+ this, TQT_SLOT( operationChanged( bool ) ) );
+ connect( editor(), TQT_SIGNAL( removeRecentFiles() ),
+ this, TQT_SLOT( removeRecentFiles() ) );
connect( mManager, TQT_SIGNAL( conversionClosed() ),
- TQT_TQOBJECT(this), TQT_SLOT(conversionClosed()) );
+ this, TQT_SLOT(conversionClosed()) );
connect( mManager, TQT_SIGNAL( searchBarClosed() ),
- TQT_TQOBJECT(this), TQT_SLOT(searchBarClosed()) );
+ this, TQT_SLOT(searchBarClosed()) );
//
// Read configuration from file and set the default editor size.
@@ -122,68 +122,68 @@ KHexEdit::~KHexEdit( void )
void KHexEdit::setupActions( void )
{
- KStdAction::openNew( TQT_TQOBJECT(editor()), TQT_SLOT(newFile()), actionCollection() );
- KStdAction::open( TQT_TQOBJECT(editor()), TQT_SLOT(open()), actionCollection() );
+ KStdAction::openNew( editor(), TQT_SLOT(newFile()), actionCollection() );
+ KStdAction::open( editor(), TQT_SLOT(open()), actionCollection() );
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
mAction.insert = new TDEAction( i18n("&Insert..."), CTRL+Key_I,
- TQT_TQOBJECT(editor()), TQT_SLOT(insertFile()), actionCollection(), "insert_file" );
- mAction.openRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() );
- mAction.save = KStdAction::save( TQT_TQOBJECT(editor()), TQT_SLOT(save()), actionCollection() );
- mAction.saveAs = KStdAction::saveAs( TQT_TQOBJECT(editor()), TQT_SLOT(saveAs()), actionCollection() );
- mAction.revert = KStdAction::revert( TQT_TQOBJECT(editor()), TQT_SLOT(reload()), actionCollection() );
- //mAction.revert = KStdAction::revert( TQT_TQOBJECT(this), TQT_SLOT(resizeTest()), actionCollection() );
-
- mAction.close = KStdAction::close( TQT_TQOBJECT(editor()), TQT_SLOT(close()), actionCollection() );
- mAction.print = KStdAction::print( TQT_TQOBJECT(editor()), TQT_SLOT(print()), actionCollection() );
+ editor(), TQT_SLOT(insertFile()), actionCollection(), "insert_file" );
+ mAction.openRecent = KStdAction::openRecent( this, TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() );
+ mAction.save = KStdAction::save( editor(), TQT_SLOT(save()), actionCollection() );
+ mAction.saveAs = KStdAction::saveAs( editor(), TQT_SLOT(saveAs()), actionCollection() );
+ mAction.revert = KStdAction::revert( editor(), TQT_SLOT(reload()), actionCollection() );
+ //mAction.revert = KStdAction::revert( this, TQT_SLOT(resizeTest()), actionCollection() );
+
+ mAction.close = KStdAction::close( editor(), TQT_SLOT(close()), actionCollection() );
+ mAction.print = KStdAction::print( editor(), TQT_SLOT(print()), actionCollection() );
mAction.exportData = new TDEAction( i18n("E&xport..."), 0,
- TQT_TQOBJECT(editor()), TQT_SLOT(exportDialog()), actionCollection(), "export" );
+ editor(), TQT_SLOT(exportDialog()), actionCollection(), "export" );
mAction.cancel = new TDEAction( i18n("&Cancel Operation"),
- "process-stop", 0, TQT_TQOBJECT(editor()), TQT_SLOT(stop()), actionCollection(), "cancel" );
+ "process-stop", 0, editor(), TQT_SLOT(stop()), actionCollection(), "cancel" );
mAction.readOnly = new TDEToggleAction( i18n("&Read Only"),
- 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleWriteProtection()),actionCollection(), "read_only" );
+ 0, editor(), TQT_SLOT(toggleWriteProtection()),actionCollection(), "read_only" );
mAction.resizeLock = new TDEToggleAction( i18n("&Allow Resize"),
- 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" );
+ 0, editor(), TQT_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" );
mAction.newWindow = new TDEAction( i18n("N&ew Window"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()),actionCollection(), "new_window" );
+ 0, this, TQT_SLOT(newWindow()),actionCollection(), "new_window" );
mAction.closeWindow= new TDEAction( i18n("Close &Window"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(closeWindow()),actionCollection(), "close_window" );
- mAction.quit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(closeProgram()), actionCollection() );
-
- mAction.undo = KStdAction::undo( TQT_TQOBJECT(editor()), TQT_SLOT(undo()), actionCollection() );
- mAction.redo = KStdAction::redo( TQT_TQOBJECT(editor()), TQT_SLOT(redo()), actionCollection() );
- mAction.cut = KStdAction::cut( TQT_TQOBJECT(editor()), TQT_SLOT(cut()), actionCollection() );
- mAction.copy = KStdAction::copy( TQT_TQOBJECT(editor()), TQT_SLOT(copy()), actionCollection() );
- mAction.paste = KStdAction::paste( TQT_TQOBJECT(editor()), TQT_SLOT(paste()), actionCollection() );
- mAction.selectAll = KStdAction::selectAll( TQT_TQOBJECT(editor()), TQT_SLOT(selectAll()),actionCollection() );
- mAction.unselect = KStdAction::deselect( TQT_TQOBJECT(editor()), TQT_SLOT(unselect()), actionCollection());
- mAction.find = KStdAction::find( TQT_TQOBJECT(editor()), TQT_SLOT(find()), actionCollection() );
- mAction.findNext = KStdAction::findNext( TQT_TQOBJECT(editor()), TQT_SLOT(findNext()), actionCollection() );
- mAction.findPrev = KStdAction::findPrev( TQT_TQOBJECT(editor()),TQT_SLOT(findPrevious()),actionCollection() );
- mAction.replace = KStdAction::replace( TQT_TQOBJECT(editor()), TQT_SLOT(replace()), actionCollection() );
+ 0, this, TQT_SLOT(closeWindow()),actionCollection(), "close_window" );
+ mAction.quit = KStdAction::quit( this, TQT_SLOT(closeProgram()), actionCollection() );
+
+ mAction.undo = KStdAction::undo( editor(), TQT_SLOT(undo()), actionCollection() );
+ mAction.redo = KStdAction::redo( editor(), TQT_SLOT(redo()), actionCollection() );
+ mAction.cut = KStdAction::cut( editor(), TQT_SLOT(cut()), actionCollection() );
+ mAction.copy = KStdAction::copy( editor(), TQT_SLOT(copy()), actionCollection() );
+ mAction.paste = KStdAction::paste( editor(), TQT_SLOT(paste()), actionCollection() );
+ mAction.selectAll = KStdAction::selectAll( editor(), TQT_SLOT(selectAll()),actionCollection() );
+ mAction.unselect = KStdAction::deselect( editor(), TQT_SLOT(unselect()), actionCollection());
+ mAction.find = KStdAction::find( editor(), TQT_SLOT(find()), actionCollection() );
+ mAction.findNext = KStdAction::findNext( editor(), TQT_SLOT(findNext()), actionCollection() );
+ mAction.findPrev = KStdAction::findPrev( editor(),TQT_SLOT(findPrevious()),actionCollection() );
+ mAction.replace = KStdAction::replace( editor(), TQT_SLOT(replace()), actionCollection() );
mAction.gotoOffset = new TDEAction( i18n("&Goto Offset..."), CTRL+Key_G,
- TQT_TQOBJECT(editor()), TQT_SLOT(gotoOffset()),actionCollection(), "goto_offset" );
+ editor(), TQT_SLOT(gotoOffset()),actionCollection(), "goto_offset" );
mAction.insertPattern = new TDEAction( i18n("&Insert Pattern..."), CTRL+Key_Insert,
- TQT_TQOBJECT(editor()), TQT_SLOT(insertPattern()), actionCollection(), "insert_pattern" );
+ editor(), TQT_SLOT(insertPattern()), actionCollection(), "insert_pattern" );
mAction.copyAsText = new TDEAction( i18n("Copy as &Text"), 0,
- TQT_TQOBJECT(editor()), TQT_SLOT(copyText()), actionCollection(), "copy_as_text" );
+ editor(), TQT_SLOT(copyText()), actionCollection(), "copy_as_text" );
mAction.pasteToNewFile = new TDEAction( i18n("Paste into New &File"), 0,
- TQT_TQOBJECT(editor()), TQT_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" );
+ editor(), TQT_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" );
mAction.pasteToNewWindow = new TDEAction( i18n("Paste into New &Window"), 0,
- TQT_TQOBJECT(this), TQT_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" );
+ this, TQT_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" );
mAction.hexadecimal = new TDERadioAction( i18n("&Hexadecimal"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_hex" );
+ 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_hex" );
mAction.decimal = new TDERadioAction( i18n("&Decimal"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_dec" );
+ 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_dec" );
mAction.octal = new TDERadioAction( i18n("&Octal"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_oct" );
+ 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_oct" );
mAction.binary = new TDERadioAction( i18n("&Binary"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_bin" );
+ 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_bin" );
mAction.textOnly = new TDERadioAction( i18n("&Text"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(setDisplayMode()), actionCollection(), "mode_text" );
+ 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_text" );
mAction.hexadecimal->setExclusiveGroup( "displayMode" );
mAction.decimal->setExclusiveGroup( "displayMode" );
mAction.octal->setExclusiveGroup( "displayMode" );
@@ -191,104 +191,104 @@ actionCollection());
mAction.textOnly->setExclusiveGroup( "displayMode" );
mAction.showOffsetColumn = new TDEToggleAction( i18n("Show O&ffset Column"),
- 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" );
+ 0, editor(), TQT_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" );
mAction.showTextColumn = new TDEToggleAction( i18n("Show Te&xt Field"),
- 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" );
+ 0, editor(), TQT_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" );
mAction.offsetAsDecimal = new TDEToggleAction( i18n("Off&set as Decimal"),
- 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" );
+ 0, editor(), TQT_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" );
mAction.dataUppercase = new TDEToggleAction( i18n("&Upper Case (Data)"),
- 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" );
+ 0, editor(), TQT_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" );
mAction.offsetUppercase = new TDEToggleAction( i18n("Upper &Case (Offset)"),
- 0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" );
+ 0, editor(), TQT_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" );
mAction.defaultEncoding = new TDERadioAction( i18n("&Default encoding", "&Default"),
- 0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_default" );
+ 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_default" );
mAction.usAsciiEncoding = new TDERadioAction( i18n("US-&ASCII (7 bit)"),
- 0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_ascii");
+ 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_ascii");
mAction.ebcdicEncoding = new TDERadioAction( i18n("&EBCDIC"),
- 0, TQT_TQOBJECT(this), TQT_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" );
+ 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" );
// mAction.customEncoding = new TDEAction( i18n("&Custom..."),
-// 0, TQT_TQOBJECT(editor()), TQT_SLOT( encoding()), actionCollection(), "enc_custom" );
+// 0, editor(), TQT_SLOT( encoding()), actionCollection(), "enc_custom" );
mAction.defaultEncoding->setExclusiveGroup( "encodingMode" );
mAction.usAsciiEncoding->setExclusiveGroup( "encodingMode" );
mAction.ebcdicEncoding->setExclusiveGroup( "encodingMode" );
mAction.strings = new TDEAction( i18n("&Extract Strings..."), 0,
- TQT_TQOBJECT(editor()), TQT_SLOT(strings()), actionCollection(), "extract_strings" );
+ editor(), TQT_SLOT(strings()), actionCollection(), "extract_strings" );
// mAction.recordViewer = new TDEAction( i18n("&Record Viewer"), 0,
-// TQT_TQOBJECT(editor()), TQT_SLOT(recordView()), actionCollection(), "record_viewer" );
+// editor(), TQT_SLOT(recordView()), actionCollection(), "record_viewer" );
mAction.filter = new TDEAction( i18n("&Binary Filter..."), 0,
- TQT_TQOBJECT(editor()), TQT_SLOT(filter()), actionCollection(), "binary_filter" );
+ editor(), TQT_SLOT(filter()), actionCollection(), "binary_filter" );
mAction.characterTable = new TDEAction( i18n("&Character Table"), 0,
- TQT_TQOBJECT(editor()), TQT_SLOT(chart()), actionCollection(), "char_table" );
+ editor(), TQT_SLOT(chart()), actionCollection(), "char_table" );
mAction.converter = new TDEAction( i18n("C&onverter"), 0,
- TQT_TQOBJECT(editor()), TQT_SLOT(converter()), actionCollection(), "converter" );
+ editor(), TQT_SLOT(converter()), actionCollection(), "converter" );
mAction.statistics = new TDEAction( i18n("&Statistics"), 0,
- TQT_TQOBJECT(editor()), TQT_SLOT(statistics()), actionCollection(), "statistics" );
+ editor(), TQT_SLOT(statistics()), actionCollection(), "statistics" );
- mAction.addBookmark = KStdAction::addBookmark( TQT_TQOBJECT(editor()),
+ mAction.addBookmark = KStdAction::addBookmark( editor(),
TQT_SLOT(addBookmark()), actionCollection() );
mAction.replaceBookmark = new TDEAction( i18n("&Replace Bookmark"), CTRL+Key_E,
- TQT_TQOBJECT(editor()), TQT_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark");
+ editor(), TQT_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark");
mAction.removeBookmark = new TDEAction( i18n("R&emove Bookmark"), CTRL+Key_U,
- TQT_TQOBJECT(editor()), TQT_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" );
+ editor(), TQT_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" );
mAction.removeAllBookmark = new TDEAction( i18n("Re&move All"), 0,
- TQT_TQOBJECT(editor()), TQT_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" );
+ editor(), TQT_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" );
mAction.nextBookmark = new TDEAction( i18n("Goto &Next Bookmark"),
- ALT+Key_Down, TQT_TQOBJECT(editor()),
+ ALT+Key_Down, editor(),
TQT_SLOT(gotoNextBookmark()), actionCollection(), "next_bookmark" );
mAction.prevBookmark = new TDEAction( i18n("Goto &Previous Bookmark"),
- ALT+Key_Up, TQT_TQOBJECT(editor()),
+ ALT+Key_Up, editor(),
TQT_SLOT(gotoPrevBookmark()), actionCollection(), "prev_bookmark" );
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
mAction.showFullPath = new TDEToggleAction( i18n("Show F&ull Path"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(showFullPath()), actionCollection(), "show_full_path" );
+ 0, this, TQT_SLOT(showFullPath()), actionCollection(), "show_full_path" );
mAction.tabHide = new TDERadioAction( i18n("&Hide"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" );
+ 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" );
mAction.tabShowAboveEditor = new TDERadioAction( i18n("&Above Editor"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" );
+ 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" );
mAction.tabShowBelowEditor = new TDERadioAction( i18n("&Below Editor"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" );
+ 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" );
mAction.tabHide->setExclusiveGroup( "editorTab" );
mAction.tabShowAboveEditor->setExclusiveGroup( "editorTab" );
mAction.tabShowBelowEditor->setExclusiveGroup( "editorTab" );
mAction.conversionHide = new TDERadioAction( i18n("&Hide"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_hide");
+ 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_hide");
mAction.conversionFloat = new TDERadioAction( i18n("&Floating"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_float");
+ 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_float");
mAction.conversionEmbed = new TDERadioAction( i18n("&Embed in Main Window"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_embed");
+ 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_embed");
mAction.conversionHide->setExclusiveGroup( "conversionField" );
mAction.conversionFloat->setExclusiveGroup( "conversionField" );
mAction.conversionEmbed->setExclusiveGroup( "conversionField" );
mAction.searchHide = new TDERadioAction( i18n("&Hide"),
- 0, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" );
+ 0, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" );
mAction.searchShowAboveEditor = new TDERadioAction( i18n("&Above Editor"),
- Key_F5, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_above" );
+ Key_F5, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_above" );
mAction.searchShowBelowEditor = new TDERadioAction( i18n("&Below Editor"),
- Key_F6, TQT_TQOBJECT(this), TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_below" );
+ Key_F6, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_below" );
mAction.searchHide->setExclusiveGroup( "searchBar" );
mAction.searchShowAboveEditor->setExclusiveGroup( "searchBar" );
mAction.searchShowBelowEditor->setExclusiveGroup( "searchBar" );
- KStdAction::saveOptions(TQT_TQOBJECT(this), TQT_SLOT(writeConfiguration()), actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(editor()) ,TQT_SLOT(options()),actionCollection() );
+ KStdAction::saveOptions(this, TQT_SLOT(writeConfiguration()), actionCollection());
+ KStdAction::preferences(editor() ,TQT_SLOT(options()),actionCollection() );
// mAction.favorites = new TDEAction( i18n("P&rofiles..."), 0,
-// TQT_TQOBJECT(editor()), TQT_SLOT(favorites()), actionCollection(), "favorites" );
+// editor(), TQT_SLOT(favorites()), actionCollection(), "favorites" );
- KStdAction::help( TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection() );
+ KStdAction::help( this, TQT_SLOT(appHelpActivated()), actionCollection() );
mDragLabel = new CDragLabel(this);
mDragLabel->setPixmap( UserIcon( "hexdrag" ) );
mDragLabel->setDragMask( UserIcon( "hexmask" ) );
mDragLabel->setEnabled( false ); // Enabled once we open a document
TQToolTip::add( mDragLabel, i18n("Drag document") );
- (void) new KWidgetAction(mDragLabel, i18n("Drag Document"), 0, TQT_TQOBJECT(editor()), TQT_SLOT(options()), actionCollection(), "drag_document");
+ (void) new KWidgetAction(mDragLabel, i18n("Drag Document"), 0, editor(), TQT_SLOT(options()), actionCollection(), "drag_document");
createGUI("khexeditui.rc", false);
@@ -297,7 +297,7 @@ actionCollection());
int id = 100;
toolBar(0)->insertButton( MainBarIcon("system-lock-screen"), id, TQT_SIGNAL(clicked()),
- TQT_TQOBJECT(editor()), TQT_SLOT(toggleWriteProtection()), true,
+ editor(), TQT_SLOT(toggleWriteProtection()), true,
i18n("Toggle write protection") );
toolBar(0)->alignItemRight( id );
mWriteProtectButton = toolBar(0)->getButton(id);
@@ -313,14 +313,14 @@ void KHexEdit::setupStatusBar( void )
{
CStatusBarProgress *progess = new CStatusBarProgress( statusBar() );
statusBar()->addWidget( progess, 10 );
- connect( progess, TQT_SIGNAL(pressed()), TQT_TQOBJECT(editor()), TQT_SLOT(stop()) );
- connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( setProgress( int ) ),
+ connect( progess, TQT_SIGNAL(pressed()), editor(), TQT_SLOT(stop()) );
+ connect( editor(), TQT_SIGNAL( setProgress( int ) ),
progess, TQT_SLOT( setValue( int ) ) );
- connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( setProgress( int, int ) ),
+ connect( editor(), TQT_SIGNAL( setProgress( int, int ) ),
progess, TQT_SLOT( setValue( int, int ) ) );
- connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( enableProgressText( bool ) ),
+ connect( editor(), TQT_SIGNAL( enableProgressText( bool ) ),
progess, TQT_SLOT( setTextEnabled( bool ) ) );
- connect( TQT_TQOBJECT(editor()), TQT_SIGNAL( setProgressText( const TQString & ) ),
+ connect( editor(), TQT_SIGNAL( setProgressText( const TQString & ) ),
progess, TQT_SLOT( setText( const TQString & ) ) );
statusBar()->insertFixedItem( i18n("Selection: 0000:0000 0000:0000"),
@@ -408,7 +408,7 @@ void KHexEdit::initialize( bool openFiles )
// is displayed, then the editor will not be visible until the error
// is confirmed and the (modal) dialog is closed.
//
- TQTimer::singleShot( 100, TQT_TQOBJECT(this), TQT_SLOT(delayedStartupOpen()) );
+ TQTimer::singleShot( 100, this, TQT_SLOT(delayedStartupOpen()) );
}
@@ -920,7 +920,7 @@ void KHexEdit::bookmarkChanged( TQPtrList<SCursorOffset> &list )
{
offset.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF );
text = i18n("Offset: %1").arg(offset);
- TDEAction *action = new TDEAction(text, 0, mAction.bookmarkMapper, TQT_SLOT(map()), TQT_TQOBJECT(this), text.latin1());
+ TDEAction *action = new TDEAction(text, 0, mAction.bookmarkMapper, TQT_SLOT(map()), this, text.latin1());
int key = acceleratorNumKey( i );
if( key > 0 )
{
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index ef0bb6e..200d1f7 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -104,69 +104,69 @@ KJotsMain::KJotsMain(const char* name)
splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1));
// create actions
- actions[ACTION_NEXT_BOOK] = new TDEAction(i18n("Next Book"), TQString(), CTRL + Key_D, TQT_TQOBJECT(this),
+ actions[ACTION_NEXT_BOOK] = new TDEAction(i18n("Next Book"), TQString(), CTRL + Key_D, this,
TQT_SLOT(nextBook()), actionCollection(), "go_next_book");
- actions[ACTION_PREV_BOOK] = new TDEAction(i18n("Previous Book"), TQString(), CTRL + SHIFT + Key_D, TQT_TQOBJECT(this),
+ actions[ACTION_PREV_BOOK] = new TDEAction(i18n("Previous Book"), TQString(), CTRL + SHIFT + Key_D, this,
TQT_SLOT(prevBook()), actionCollection(), "go_prev_book");
- actions[ACTION_NEXT_PAGE] = new TDEAction(i18n("Next Page"), TQString(), CTRL + Key_PageDown, TQT_TQOBJECT(this),
+ actions[ACTION_NEXT_PAGE] = new TDEAction(i18n("Next Page"), TQString(), CTRL + Key_PageDown, this,
TQT_SLOT(nextPage()), actionCollection(), "go_next_page");
- actions[ACTION_PREV_PAGE] = new TDEAction(i18n("Previous Page"), TQString(), CTRL + Key_PageUp, TQT_TQOBJECT(this),
+ actions[ACTION_PREV_PAGE] = new TDEAction(i18n("Previous Page"), TQString(), CTRL + Key_PageUp, this,
TQT_SLOT(prevPage()), actionCollection(), "go_prev_page");
- actions[ACTION_NEW_PAGE] = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newEntry()), actionCollection());
+ actions[ACTION_NEW_PAGE] = KStdAction::openNew(this, TQT_SLOT(newEntry()), actionCollection());
actions[ACTION_NEW_PAGE]->setText(i18n("&New Page"));
- actions[ACTION_NEW_BOOK] = new TDEAction(i18n("New &Book..."), "contents", CTRL + SHIFT + Key_N, TQT_TQOBJECT(this),
+ actions[ACTION_NEW_BOOK] = new TDEAction(i18n("New &Book..."), "contents", CTRL + SHIFT + Key_N, this,
TQT_SLOT(createNewBook()), actionCollection(), "new_book");
exportPageMenu = new TDEActionMenu(i18n("Export Page"), actionCollection(), "save_page_to");
- actions[ACTION_PAGE2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, TQT_TQOBJECT(this),
+ actions[ACTION_PAGE2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, this,
TQT_SLOT(writePage()), actionCollection(), "save_page_to_ascii");
actions[ACTION_PAGE2TEXT]->plug(exportPageMenu->popupMenu());
- actions[ACTION_PAGE2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, TQT_TQOBJECT(this),
+ actions[ACTION_PAGE2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, this,
TQT_SLOT(writePageToHTML()), actionCollection(), "save_page_to_html");
actions[ACTION_PAGE2HTML]->plug(exportPageMenu->popupMenu());
exportBookMenu = new TDEActionMenu(i18n("Export Book"), actionCollection(), "save_book_to");
- actions[ACTION_BOOK2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, TQT_TQOBJECT(this),
+ actions[ACTION_BOOK2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, this,
TQT_SLOT(writeBook()), actionCollection(), "save_book_to_ascii");
actions[ACTION_BOOK2TEXT]->plug(exportBookMenu->popupMenu());
- actions[ACTION_BOOK2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, TQT_TQOBJECT(this),
+ actions[ACTION_BOOK2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, this,
TQT_SLOT(writeBookToHTML()), actionCollection(), "save_book_to_html");
actions[ACTION_BOOK2HTML]->plug(exportBookMenu->popupMenu());
- actions[ACTION_DELETE_PAGE] = new TDEAction(i18n("&Delete Page"), "edit-delete", CTRL + Key_Delete, TQT_TQOBJECT(this),
+ actions[ACTION_DELETE_PAGE] = new TDEAction(i18n("&Delete Page"), "edit-delete", CTRL + Key_Delete, this,
TQT_SLOT(deleteEntry()), actionCollection(), "del_page");
- actions[ACTION_DELETE_BOOK] = new TDEAction(i18n("Delete Boo&k"), "edit-delete", CTRL + SHIFT + Key_Delete, TQT_TQOBJECT(this),
+ actions[ACTION_DELETE_BOOK] = new TDEAction(i18n("Delete Boo&k"), "edit-delete", CTRL + SHIFT + Key_Delete, this,
TQT_SLOT(deleteBook()), actionCollection(), "del_folder");
actions[ACTION_MANUAL_SAVE] = new TDEAction(i18n("Manual Save"), 0, TDEStdAccel::save(),
- TQT_TQOBJECT(this), TQT_SLOT(autoSave()), actionCollection(), "manual_save");
- actions[ACTION_PRINT] = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection());
- actions[ACTION_QUIT] = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
+ this, TQT_SLOT(autoSave()), actionCollection(), "manual_save");
+ actions[ACTION_PRINT] = KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection());
+ actions[ACTION_QUIT] = KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection());
- actions[ACTION_CUT] = KStdAction::cut(TQT_TQOBJECT(me_text), TQT_SLOT(cut()), actionCollection());
+ actions[ACTION_CUT] = KStdAction::cut(me_text, TQT_SLOT(cut()), actionCollection());
connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_CUT], TQT_SLOT(setEnabled(bool)));
actions[ACTION_CUT]->setEnabled(false);
- actions[ACTION_COPY] = KStdAction::copy(TQT_TQOBJECT(me_text), TQT_SLOT(copy()), actionCollection());
+ actions[ACTION_COPY] = KStdAction::copy(me_text, TQT_SLOT(copy()), actionCollection());
connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_COPY], TQT_SLOT(setEnabled(bool)));
actions[ACTION_COPY]->setEnabled(false);
- actions[ACTION_PASTE2TITLE] = new TDEAction(i18n("Copy &into Page Title"), "edit-copy", CTRL+Key_T, TQT_TQOBJECT(this),
+ actions[ACTION_PASTE2TITLE] = new TDEAction(i18n("Copy &into Page Title"), "edit-copy", CTRL+Key_T, this,
TQT_SLOT(copySelection()), actionCollection(), "copyIntoTitle");
connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_PASTE2TITLE], TQT_SLOT(setEnabled(bool)));
actions[ACTION_PASTE2TITLE]->setEnabled(false);
- actions[ACTION_PASTE] = KStdAction::pasteText(TQT_TQOBJECT(me_text), TQT_SLOT(paste()), actionCollection());
+ actions[ACTION_PASTE] = KStdAction::pasteText(me_text, TQT_SLOT(paste()), actionCollection());
- actions[ACTION_FIND] = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotSearch() ), actionCollection() );
- actions[ACTION_FIND_NEXT] = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotRepeatSearch() ), actionCollection() );
+ actions[ACTION_FIND] = KStdAction::find( this, TQT_SLOT( slotSearch() ), actionCollection() );
+ actions[ACTION_FIND_NEXT] = KStdAction::findNext( this, TQT_SLOT( slotRepeatSearch() ), actionCollection() );
actions[ACTION_FIND_NEXT]->setEnabled(false);
- actions[ACTION_REPLACE] = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), actionCollection() );
+ actions[ACTION_REPLACE] = KStdAction::replace( this, TQT_SLOT( slotReplace() ), actionCollection() );
- actions[ACTION_RENAME] = new TDEAction(i18n("Rename..."), TQString(), CTRL + Key_M, TQT_TQOBJECT(this),
+ actions[ACTION_RENAME] = new TDEAction(i18n("Rename..."), TQString(), CTRL + Key_M, this,
TQT_SLOT(slotRenameEntry()), actionCollection(), "rename_entry");
- actions[ACTION_INSERT_DATE] = new TDEAction(i18n("Insert Date"), "date", CTRL + Key_I, TQT_TQOBJECT(this),
+ actions[ACTION_INSERT_DATE] = new TDEAction(i18n("Insert Date"), "date", CTRL + Key_I, this,
TQT_SLOT(insertDate()), actionCollection(), "insert_date");
- KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection());
+ KStdAction::preferences(this, TQT_SLOT(configure()), actionCollection());
bookmarkMenu = new TDEActionMenu(i18n("&Bookmarks"), "bookmarks", actionCollection(), "bookmarks");
KJotsBookmarks* bookmarks = new KJotsBookmarks(this);
@@ -657,7 +657,7 @@ void KJotsMain::slotFindSuccessful()
void KJotsMain::showListviewContextMenu(TDEListView*, TQListViewItem* i, const TQPoint& p)
{
if ( invalidMoveFlag ) return; //Prevent race condition
- TDEActionMenu* am = new TDEActionMenu(TQT_TQOBJECT(this));
+ TDEActionMenu* am = new TDEActionMenu(this);
if (!i)
{
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
index e1522d4..d6e7f11 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
+++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
@@ -66,7 +66,7 @@ KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList
layout->addWidget( mKVaioGeneral );
layout->addStretch();
- mDriver = new KVaioDriverInterface(TQT_TQOBJECT(this));
+ mDriver = new KVaioDriverInterface(this);
mDriverAvailable = mDriver->connectToDriver(false);
mTimer = new TQTimer(this);
mTimer->start(231);
diff --git a/kregexpeditor/KMultiFormListBox/ccp.cpp b/kregexpeditor/KMultiFormListBox/ccp.cpp
index 7b21f51..4f0d4b3 100644
--- a/kregexpeditor/KMultiFormListBox/ccp.cpp
+++ b/kregexpeditor/KMultiFormListBox/ccp.cpp
@@ -32,7 +32,7 @@
CCP::CCP(KMultiFormListBoxMultiVisible *ee_, KMultiFormListBoxEntry *eee_) : TQObject() {
ee = ee_;
eee = eee_;
- install(TQT_TQOBJECT(eee));
+ install(eee);
}
void CCP::install(TQObject *elm)
diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp
index 09c5052..02941a2 100644
--- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp
@@ -266,14 +266,14 @@ void KMultiFormListBoxMultiVisible::cut(KMultiFormListBoxEntry *elm)
}
TQDataStream stream(clipboard, IO_WriteOnly);
- factory->toStream( TQT_TQOBJECT(elm), stream );
+ factory->toStream( elm, stream );
delElement(elm);
}
void KMultiFormListBoxMultiVisible::copy(KMultiFormListBoxEntry *elm)
{
TQDataStream stream(clipboard, IO_WriteOnly);
- factory->toStream(TQT_TQOBJECT(elm), stream);
+ factory->toStream(elm, stream);
}
void KMultiFormListBoxMultiVisible::paste(KMultiFormListBoxEntry *oldElm)
@@ -285,7 +285,7 @@ void KMultiFormListBoxMultiVisible::paste(KMultiFormListBoxEntry *oldElm)
KMultiFormListBoxEntry *newElm = factory->create(viewport());
TQDataStream stream( clipboard, IO_ReadOnly );
- factory->fromStream(stream, TQT_TQOBJECT(newElm));
+ factory->fromStream(stream, newElm);
insertElmIntoWidget(newElm,oldElm);
}
diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp
index 33eda27..2b22ee5 100644
--- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.cpp
@@ -77,7 +77,7 @@ void KMultiFormListBox::toStream( TQDataStream& stream ) const
const KMultiFormListBoxEntryList elms = elements();
stream << elms.count();
for ( TQPtrListIterator<KMultiFormListBoxEntry> it(elms); *it; ++it)
- _factory->toStream( TQT_TQOBJECT(*it), stream );
+ _factory->toStream( *it, stream );
}
void KMultiFormListBox::fromStream( TQDataStream& stream )
@@ -97,7 +97,7 @@ void KMultiFormListBox::fromStream( TQDataStream& stream )
KMultiFormListBoxEntryList elms = elements();
for (TQPtrListIterator<KMultiFormListBoxEntry> it(elms); *it; ++it)
- _factory->fromStream( stream, TQT_TQOBJECT(*it) );
+ _factory->fromStream( stream, *it );
}
diff --git a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp
index 9b055a3..6d101a0 100644
--- a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp
+++ b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp
@@ -47,7 +47,7 @@ void WidgetWindow::init(KMultiFormListBoxFactory *factory, TDEListBox *lb, KMult
myWidget = factory->create(frame);
}
TQDataStream stream( _backup, IO_WriteOnly );
- myFact->toStream( TQT_TQOBJECT(myWidget), stream );
+ myFact->toStream( myWidget, stream );
lay->addWidget(myWidget);
@@ -86,7 +86,7 @@ void WidgetWindow::slotCancel()
}
else {
TQDataStream stream( _backup, IO_ReadOnly );
- myFact->fromStream( stream, TQT_TQOBJECT(myWidget) );
+ myFact->fromStream( stream, myWidget );
}
KDialogBase::slotCancel();
}
@@ -96,9 +96,9 @@ WidgetWindow *WidgetWindow::clone()
WidgetWindow *item = new WidgetWindow(myFact, listbox);
TQByteArray data;
TQDataStream ws( data, IO_WriteOnly );
- myFact->toStream( TQT_TQOBJECT(myWidget), ws );
+ myFact->toStream( myWidget, ws );
TQDataStream rs( data, IO_ReadOnly );
- myFact->fromStream( rs, TQT_TQOBJECT(item->myWidget) );
+ myFact->fromStream( rs, item->myWidget );
item->slotOk();
return item;
@@ -107,7 +107,7 @@ WidgetWindow *WidgetWindow::clone()
void WidgetWindow::display()
{
TQDataStream stream( _backup, IO_WriteOnly);
- myFact->toStream( TQT_TQOBJECT(myWidget), stream );
+ myFact->toStream( myWidget, stream );
show();
}
diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp
index c65e598..56b3226 100644
--- a/kregexpeditor/compoundwidget.cpp
+++ b/kregexpeditor/compoundwidget.cpp
@@ -246,7 +246,7 @@ void CompoundWidget::slotConfigCanceled()
{
TQDataStream stream( _backup, IO_ReadOnly );
KWidgetStreamer streamer;
- streamer.fromStream( stream, TQT_TQOBJECT(_content) );
+ streamer.fromStream( stream, _content );
repaint();
}
@@ -300,7 +300,7 @@ int CompoundWidget::edit()
_configWindow->sizeHint().height()/2) );
TQDataStream stream( _backup, IO_WriteOnly );
KWidgetStreamer streamer;
- streamer.toStream( TQT_TQOBJECT(_content), stream );
+ streamer.toStream( _content, stream );
return _configWindow->exec();
}
diff --git a/kregexpeditor/limitedcharlineedit.cpp b/kregexpeditor/limitedcharlineedit.cpp
index 5e494d8..f311ebe 100644
--- a/kregexpeditor/limitedcharlineedit.cpp
+++ b/kregexpeditor/limitedcharlineedit.cpp
@@ -26,7 +26,7 @@ class Validator :public TQValidator
{
public:
Validator( LimitedCharLineEdit::Mode mode, TQWidget* parent )
- :TQValidator( TQT_TQOBJECT(parent), "Validator" ), _mode(mode)
+ :TQValidator( parent, "Validator" ), _mode(mode)
{
}
diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp
index a6bb121..1974534 100644
--- a/kregexpeditor/regexpbuttons.cpp
+++ b/kregexpeditor/regexpbuttons.cpp
@@ -43,7 +43,7 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
_grp->hide();
_grp->setExclusive( true );
- _mapper = new TQSignalMapper( TQT_TQOBJECT(this), "RegExpButtons::_mapper" );
+ _mapper = new TQSignalMapper( this, "RegExpButtons::_mapper" );
connect( _mapper, TQT_SIGNAL( mapped(int) ), this, TQT_SIGNAL( clicked(int) ) );
// The "select" button.
@@ -164,7 +164,7 @@ DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQStri
DoubleClickButton* but = new DoubleClickButton( pix, this, "RegExpButtons::but");
- _mapper->setMapping( TQT_TQOBJECT(but), tp );
+ _mapper->setMapping( but, tp );
connect( but, TQT_SIGNAL( clicked() ), _mapper, TQT_SLOT( map() ) );
connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSetNonKeepMode() ) );
diff --git a/kregexpeditor/repeatwidget.cpp b/kregexpeditor/repeatwidget.cpp
index 085c36b..b46cade 100644
--- a/kregexpeditor/repeatwidget.cpp
+++ b/kregexpeditor/repeatwidget.cpp
@@ -151,7 +151,7 @@ void RepeatWidget::slotConfigCanceled()
{
TQDataStream stream( _backup, IO_ReadOnly );
KWidgetStreamer streamer;
- streamer.fromStream( stream, TQT_TQOBJECT(_content) );
+ streamer.fromStream( stream, _content );
repaint();
}
@@ -161,7 +161,7 @@ int RepeatWidget::edit()
_configWindow->sizeHint().height()/2) );
TQDataStream stream( _backup, IO_WriteOnly );
KWidgetStreamer streamer;
- streamer.toStream( TQT_TQOBJECT(_content), stream );
+ streamer.toStream( _content, stream );
return _configWindow->exec();
}
diff --git a/kregexpeditor/textwidget.cpp b/kregexpeditor/textwidget.cpp
index 35af60b..121dad4 100644
--- a/kregexpeditor/textwidget.cpp
+++ b/kregexpeditor/textwidget.cpp
@@ -60,7 +60,7 @@ void TextWidget::slotUpdate()
// widget may not be enough for the parent to change size, and in that
// case the parent would not repaint, and the text widget would not be
// resized.
- TQWidget *p = TQT_TQWIDGET(parent());
+ TQWidget *p = static_cast<TQWidget*>(parent());
if (p)
p->repaint();
_editorWindow->updateContent( this );
diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp
index 6a4381d..6e224f8 100644
--- a/ksim/monitors/snmp/browsedialog.cpp
+++ b/ksim/monitors/snmp/browsedialog.cpp
@@ -95,7 +95,7 @@ void BrowseDialog::startWalk( const Identifier &startOid )
{
stopWalker();
- m_walker = new Walker( m_host, startOid, TQT_TQOBJECT(this) );
+ m_walker = new Walker( m_host, startOid, this );
connect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ),
this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) );
connect( m_walker, TQT_SIGNAL( finished() ),
diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp
index 6f6575d..5242ee0 100644
--- a/ksim/monitors/snmp/monitorconfig.cpp
+++ b/ksim/monitors/snmp/monitorconfig.cpp
@@ -107,7 +107,7 @@ TQWidget *MonitorConfig::createMonitorWidget( TQWidget *parent, const char *name
else
w = new ChartMonitor( *this, parent, name );
- Monitor *monitor = new Monitor( host, id, refresh, TQT_TQOBJECT(w) );
+ Monitor *monitor = new Monitor( host, id, refresh, w );
TQObject::connect( monitor, TQT_SIGNAL( newData( const Value & ) ),
w, TQT_SLOT( setData( const Value & ) ) );
return w;
diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp
index 489080e..736c534 100644
--- a/ksim/monitors/snmp/probedialog.cpp
+++ b/ksim/monitors/snmp/probedialog.cpp
@@ -77,7 +77,7 @@ void ProbeDialog::probeOne()
Identifier oid = m_probeOIDs.pop();
delete m_currentMonitor;
- m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, TQT_TQOBJECT(this) );
+ m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, this );
connect( m_currentMonitor, TQT_SIGNAL( newData( const Identifier &, const Value & ) ),
this, TQT_SLOT( probeResult( const Identifier &, const Value & ) ) );
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index b5618a4..ebd7f2f 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -170,7 +170,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
toDesktopMenu = new TDEPopupMenu (this);
toDesktopMenu -> setCheckable(true);
mid = toDesktopMenu -> insertItem (i18n("&All Desktops"),
- dslot = new DesktopChangeSlot(TQT_TQOBJECT(this),0),
+ dslot = new DesktopChangeSlot(this,0),
TQT_SLOT(receive()));
dslot->setMenuId(mid);
@@ -181,7 +181,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
name += ('0' + ndesktop);
mid = toDesktopMenu -> insertItem (name,
- dslot = new DesktopChangeSlot(TQT_TQOBJECT(this), ndesktop), TQT_SLOT(receive()));
+ dslot = new DesktopChangeSlot(this, ndesktop), TQT_SLOT(receive()));
dslot->setMenuId(mid);
}
@@ -196,7 +196,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
TQT_SLOT(updateSensors()), Key_F5 );
toggleLocked = new TDEToggleAction ( i18n("Toggle &Locked Position"),
SmallIconSet("locked"),
- CTRL+Key_L, TQT_TQOBJECT(this),
+ CTRL+Key_L, this,
TQT_SLOT( slotToggleLocked() ),
accColl, "Locked position" );
accColl->insert(toggleLocked);
@@ -205,7 +205,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
toggleLocked->plug(kpop);
toggleFastTransforms = new TDEToggleAction(i18n("Use &Fast Image Scaling"),
- CTRL+Key_F, TQT_TQOBJECT(this),
+ CTRL+Key_F, this,
TQT_SLOT( slotToggleFastTransforms() ),
accColl, "Fast transformations");
@@ -1778,7 +1778,7 @@ void karamba::addMenuConfigOption(TQString key, TQString name)
//tqDebug("karamba::addMenuConfigOption");
kpop -> setItemEnabled(THEMECONF, true);
- SignalBridge* action = new SignalBridge(TQT_TQOBJECT(this), key, menuAccColl);
+ SignalBridge* action = new SignalBridge(this, key, menuAccColl);
TDEToggleAction* confItem = new TDEToggleAction (name, TDEShortcut::null(),
action, TQT_SLOT(receive()),
menuAccColl, key.ascii());
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index d567eb7..79d7d42 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -296,7 +296,7 @@ void KarambaApplication::addKaramba(karamba* k, bool reloading)
karambaApp->dcopClient()->appId(), k->theme().file());
k->setInstance(instance);
}
- karambaList->append(TQT_TQOBJECT(k));
+ karambaList->append(k);
}
void KarambaApplication::deleteKaramba(karamba* k, bool reloading)
@@ -304,12 +304,12 @@ void KarambaApplication::deleteKaramba(karamba* k, bool reloading)
if(!reloading && karambaApp->dcopStub())
karambaApp->dcopStub()->themeClosed(
karambaApp->dcopClient()->appId(), k->theme().file(), k->instance());
- karambaList->removeRef(TQT_TQOBJECT(k));
+ karambaList->removeRef(k);
}
bool KarambaApplication::hasKaramba(karamba* k)
{
- return karambaList->containsRef(TQT_TQOBJECT(k)) > 0;
+ return karambaList->containsRef(k) > 0;
}
// XXX: I guess this should be made with mutex/semaphores
diff --git a/superkaramba/src/menu_python.cpp b/superkaramba/src/menu_python.cpp
index 5d80a75..c42a009 100644
--- a/superkaramba/src/menu_python.cpp
+++ b/superkaramba/src/menu_python.cpp
@@ -38,7 +38,7 @@ long createMenu(long widget)
karamba* currTheme = (karamba*)widget;
TDEPopupMenu* tmp = new TDEPopupMenu(currTheme);
- currTheme->menuList->append( TQT_TQOBJECT(tmp) );
+ currTheme->menuList->append( tmp );
currTheme->connect(tmp, TQT_SIGNAL(activated(int)), currTheme,
TQT_SLOT(passMenuItemClicked(int)));
@@ -86,7 +86,7 @@ long deleteMenu(long widget, long menu)
karamba* currTheme = (karamba*)widget;
TDEPopupMenu* tmp = (TDEPopupMenu*)menu;
- currTheme->menuList->removeRef(TQT_TQOBJECT(tmp));
+ currTheme->menuList->removeRef(tmp);
return 1;
}
diff --git a/superkaramba/src/sklineedit.cpp b/superkaramba/src/sklineedit.cpp
index 57b9db0..86f281a 100644
--- a/superkaramba/src/sklineedit.cpp
+++ b/superkaramba/src/sklineedit.cpp
@@ -66,7 +66,7 @@ void SKLineEdit::keyPressEvent(TQKeyEvent* e)
if(!e->text().isEmpty())
{
- karamba* k = static_cast<karamba*>(TQT_TQWIDGET(parent()));
+ karamba* k = static_cast<karamba*>(parent());
k->keyPressed(e->text(), m_input);
}
}
diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp
index 48cef86..e58f9b3 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -773,7 +773,7 @@ void Task::updateThumbnail()
// by the thumbnail generation. This makes things much smoother
// on slower machines.
//
- TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop());
+ TQWidget *rootWin = tqApp->desktop();
TQRect geom = _info.geometry();
_grab = TQPixmap::grabWindow( rootWin->winId(),
geom.x(), geom.y(),
diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp
index 8cf3b92..84e1590 100644
--- a/superkaramba/src/themefile.cpp
+++ b/superkaramba/src/themefile.cpp
@@ -209,7 +209,7 @@ bool ThemeFile::set(const KURL &url)
{
if(!url.isLocalFile() && !url.protocol().isEmpty())
{
- if(KMessageBox::warningContinueCancel(TQT_TQWIDGET(kapp->activeWindow()),
+ if(KMessageBox::warningContinueCancel(kapp->activeWindow(),
i18n("You are about to install and run %1 SuperKaramba theme. Since "
"themes can contain executable code you should only install themes "
"from sources that you trust. Continue?"), i18n("Executable Code Warning"), i18n("Install")
@@ -224,7 +224,7 @@ bool ThemeFile::set(const KURL &url)
if(localFile.exists())
{
- if(KMessageBox::warningContinueCancel(TQT_TQWIDGET(kapp->activeWindow()),
+ if(KMessageBox::warningContinueCancel(kapp->activeWindow(),
i18n("%1 already exists. Do you want to overwrite it?")
.arg(localFile.filePath()),i18n("File Exists"),i18n("Overwrite"))
== KMessageBox::Cancel)
diff --git a/tdefilereplace/tdefilereplace.cpp b/tdefilereplace/tdefilereplace.cpp
index 8cb7d33..4b9497b 100644
--- a/tdefilereplace/tdefilereplace.cpp
+++ b/tdefilereplace/tdefilereplace.cpp
@@ -30,15 +30,15 @@ TDEFileReplace::TDEFileReplace()
KLibFactory *factory = KLibLoader::self()->factory("libtdefilereplacepart");
if (factory)
{
- m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this),
+ m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this,
"tdefilereplace_part", "KParts::ReadOnlyPart" ));
if (m_part)
{
setCentralWidget(m_part->widget());
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
- KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection());
- KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
+ KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+ KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection());
+ KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection());
setStandardToolBarMenuEnabled(true);
createGUI(m_part);
removeDuplicatedActions();
diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index 14d9ff3..86cd451 100644
--- a/tdefilereplace/tdefilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -509,50 +509,50 @@ void TDEFileReplacePart::initGUI()
connect(m_view, TQT_SIGNAL(updateGUI()), this, TQT_SLOT(updateGUI()));
// File
- (void)new TDEAction(i18n("Customize Search/Replace Session..."), "projectopen", TDEShortcut(CTRL + Key_F), TQT_TQOBJECT(this), TQT_SLOT(slotSetNewParameters()), actionCollection(), "new_project");
- (void)new TDEAction(i18n("&Search"), "filesearch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearchingOperation()), actionCollection(), "search");
- (void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate");
- (void)new TDEAction(i18n("&Replace"), "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace");
- (void)new TDEAction(i18n("Sto&p"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop");
- (void)new TDEAction(i18n("Cre&ate Report File..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "results_create_report");
- (void)new TDEAction(i18n("&Save Results List to File..."), "document-save-as", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultSave()), actionCollection(), "results_save");
- (void)new TDEAction(i18n("&Load Results List From File..."), "unsortedList", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultLoad()), actionCollection(), "results_load");
+ (void)new TDEAction(i18n("Customize Search/Replace Session..."), "projectopen", TDEShortcut(CTRL + Key_F), this, TQT_SLOT(slotSetNewParameters()), actionCollection(), "new_project");
+ (void)new TDEAction(i18n("&Search"), "filesearch", 0, this, TQT_SLOT(slotSearchingOperation()), actionCollection(), "search");
+ (void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, this, TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate");
+ (void)new TDEAction(i18n("&Replace"), "filereplace", 0, this, TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace");
+ (void)new TDEAction(i18n("Sto&p"), "process-stop", 0, this, TQT_SLOT(slotStop()), actionCollection(), "stop");
+ (void)new TDEAction(i18n("Cre&ate Report File..."), "document-save-as", 0, this, TQT_SLOT(slotCreateReport()), actionCollection(), "results_create_report");
+ (void)new TDEAction(i18n("&Save Results List to File..."), "document-save-as", 0, m_view, TQT_SLOT(slotResultSave()), actionCollection(), "results_save");
+ (void)new TDEAction(i18n("&Load Results List From File..."), "unsortedList", 0, m_view, TQT_SLOT(slotResultLoad()), actionCollection(), "results_load");
// Strings
- (void)new TDEAction(i18n("&Add String..."), "editadd", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add");
- (void)new TDEAction(i18n("&Delete String"), "editremove", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del");
- (void)new TDEAction(i18n("&Empty Strings List"), "edit-delete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty");
- (void)new TDEAction(i18n("&Save Strings List to File..."), "document-save-as", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save");
- (void)new TDEAction(i18n("&Load Strings List From File..."), "unsortedList", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load");
- (void)new TDEAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert");
- (void)new TDEAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all");
+ (void)new TDEAction(i18n("&Add String..."), "editadd", 0, m_view, TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add");
+ (void)new TDEAction(i18n("&Delete String"), "editremove", 0, m_view, TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del");
+ (void)new TDEAction(i18n("&Empty Strings List"), "edit-delete", 0, m_view, TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty");
+ (void)new TDEAction(i18n("&Save Strings List to File..."), "document-save-as", 0, m_view, TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save");
+ (void)new TDEAction(i18n("&Load Strings List From File..."), "unsortedList", 0, m_view, TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load");
+ (void)new TDEAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, m_view, TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert");
+ (void)new TDEAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, m_view, TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all");
// Options
- (void)new TDEToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive");
- (void)new TDEToggleAction(i18n("Create &Backup Files"), "backup_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionBackup()), actionCollection(), "options_backup");
- (void)new TDEToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case");
- (void)new TDEToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionVariables()), actionCollection(), "options_var");
- (void)new TDEToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions");
- (void)new TDEAction(i18n("Configure &TDEFileReplace..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace");
+ (void)new TDEToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, this, TQT_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive");
+ (void)new TDEToggleAction(i18n("Create &Backup Files"), "backup_option", 0, this, TQT_SLOT(slotOptionBackup()), actionCollection(), "options_backup");
+ (void)new TDEToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, this, TQT_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case");
+ (void)new TDEToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, this, TQT_SLOT(slotOptionVariables()), actionCollection(), "options_var");
+ (void)new TDEToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, this, TQT_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions");
+ (void)new TDEAction(i18n("Configure &TDEFileReplace..."), "configure", 0, this, TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace");
// Results
- (void)new TDEAction(i18n("&Properties"), "informations", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos");
- (void)new TDEAction(i18n("&Open"), "document-open", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile");
- (void)new TDEAction(i18n("Open &With..."), "document-open", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpenWith()), actionCollection(), "results_openfilewith");
+ (void)new TDEAction(i18n("&Properties"), "informations", 0, m_view, TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos");
+ (void)new TDEAction(i18n("&Open"), "document-open", 0, m_view, TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile");
+ (void)new TDEAction(i18n("Open &With..."), "document-open", 0, m_view, TQT_SLOT(slotResultOpenWith()), actionCollection(), "results_openfilewith");
if(quantaFound)
{
- (void)new TDEAction(i18n("&Edit in Quanta"), "quanta", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile");
+ (void)new TDEAction(i18n("&Edit in Quanta"), "quanta", 0, m_view, TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile");
}
- (void)new TDEAction(i18n("Open Parent &Folder"), "go-up", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir");
- (void)new TDEAction(i18n("Remove &Entry"), "edit-clear", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultRemoveEntry()), actionCollection(), "results_removeentry");
- (void)new TDEAction(i18n("&Delete"), "edit-delete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete");
- (void)new TDEAction(i18n("E&xpand Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand");
- (void)new TDEAction(i18n("&Reduce Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce");
+ (void)new TDEAction(i18n("Open Parent &Folder"), "go-up", 0, m_view, TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir");
+ (void)new TDEAction(i18n("Remove &Entry"), "edit-clear", 0, m_view, TQT_SLOT(slotResultRemoveEntry()), actionCollection(), "results_removeentry");
+ (void)new TDEAction(i18n("&Delete"), "edit-delete", 0, m_view, TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete");
+ (void)new TDEAction(i18n("E&xpand Tree"), 0, m_view, TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand");
+ (void)new TDEAction(i18n("&Reduce Tree"), 0, m_view, TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce");
// Help
- (void)new TDEAction(i18n("&About TDEFileReplace"), "tdefilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace");
- (void)new TDEAction(i18n("TDEFileReplace &Handbook"), "help", 0, TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace");
- (void)new TDEAction(i18n("&Report Bug"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(reportBug()), actionCollection(), "report_bug");
+ (void)new TDEAction(i18n("&About TDEFileReplace"), "tdefilereplace", 0, this, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace");
+ (void)new TDEAction(i18n("TDEFileReplace &Handbook"), "help", 0, this, TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace");
+ (void)new TDEAction(i18n("&Report Bug"), 0, 0, this, TQT_SLOT(reportBug()), actionCollection(), "report_bug");
}
void TDEFileReplacePart::initView()
diff --git a/tdelirc/kcmlirc/kcmlircbase.ui.h b/tdelirc/kcmlirc/kcmlircbase.ui.h
index dcf2ec3..f7dc483 100644
--- a/tdelirc/kcmlirc/kcmlircbase.ui.h
+++ b/tdelirc/kcmlirc/kcmlircbase.ui.h
@@ -23,7 +23,7 @@ void KCMLircBase::init()
{
delete theModes;
modeLayout->removeItem(modeButtonLayout);
- theModes = new ModesList(TQT_TQWIDGET(modeLayout->parent()), "theModes");
+ theModes = new ModesList(static_cast<TQWidget*>(modeLayout->parent()), "theModes");
theModes->addColumn(i18n("Remote Control"));
theModes->addColumn(i18n("Default"));
theModes->addColumn(i18n("Icon"));
diff --git a/tdewallet/kwmapeditor.cpp b/tdewallet/kwmapeditor.cpp
index 32ff65e..87e2f88 100644
--- a/tdewallet/kwmapeditor.cpp
+++ b/tdewallet/kwmapeditor.cpp
@@ -34,7 +34,7 @@
KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent, const char *name)
: TQTable(0, 3, parent, name), _map(map) {
_ac = new TDEActionCollection(this);
- _copyAct = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), _ac);
+ _copyAct = KStdAction::copy(this, TQT_SLOT(copy()), _ac);
connect(this, TQT_SIGNAL(valueChanged(int,int)), this, TQT_SIGNAL(dirty()));
connect(this, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)),
this, TQT_SLOT(contextMenu(int,int,const TQPoint&)));
diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp
index 4fd16f5..81321f7 100644
--- a/tdewallet/tdewalleteditor.cpp
+++ b/tdewallet/tdewalleteditor.cpp
@@ -66,7 +66,7 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget *
: TDEMainWindow(parent, name), _walletName(wallet), _nonLocal(isPath) {
_newWallet = false;
_ww = new WalletWidget(this, "Wallet Widget");
- _copyPassAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copyPassword()), actionCollection());
+ _copyPassAction = KStdAction::copy(this, TQT_SLOT(copyPassword()), actionCollection());
TQVBoxLayout *box = new TQVBoxLayout(_ww->_entryListFrame);
box->setSpacing( KDialog::spacingHint() );
@@ -159,48 +159,48 @@ void TDEWalletEditor::layout() {
void TDEWalletEditor::createActions() {
_newFolderAction = new TDEAction(i18n("&New Folder..."), "folder-new",
- 0, TQT_TQOBJECT(this), TQT_SLOT(createFolder()), actionCollection(),
+ 0, this, TQT_SLOT(createFolder()), actionCollection(),
"create_folder");
connect(this, TQT_SIGNAL(enableFolderActions(bool)),
_newFolderAction, TQT_SLOT(setEnabled(bool)));
_deleteFolderAction = new TDEAction(i18n("&Delete Folder"), 0, 0,
- TQT_TQOBJECT(this), TQT_SLOT(deleteFolder()), actionCollection(),
+ this, TQT_SLOT(deleteFolder()), actionCollection(),
"delete_folder");
connect(this, TQT_SIGNAL(enableContextFolderActions(bool)),
_deleteFolderAction, TQT_SLOT(setEnabled(bool)));
connect(this, TQT_SIGNAL(enableFolderActions(bool)),
_deleteFolderAction, TQT_SLOT(setEnabled(bool)));
- _passwordAction = new TDEAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this),
+ _passwordAction = new TDEAction(i18n("Change &Password..."), 0, 0, this,
TQT_SLOT(changePassword()), actionCollection(),
"change_password");
connect(this, TQT_SIGNAL(enableWalletActions(bool)),
_passwordAction, TQT_SLOT(setEnabled(bool)));
- _mergeAction = new TDEAction(i18n("&Merge Wallet..."), 0, 0, TQT_TQOBJECT(this),
+ _mergeAction = new TDEAction(i18n("&Merge Wallet..."), 0, 0, this,
TQT_SLOT(importWallet()), actionCollection(),
"merge");
connect(this, TQT_SIGNAL(enableWalletActions(bool)),
_mergeAction, TQT_SLOT(setEnabled(bool)));
- _importAction = new TDEAction(i18n("&Import XML..."), 0, 0, TQT_TQOBJECT(this),
+ _importAction = new TDEAction(i18n("&Import XML..."), 0, 0, this,
TQT_SLOT(importXML()), actionCollection(),
"import");
connect(this, TQT_SIGNAL(enableWalletActions(bool)),
_importAction, TQT_SLOT(setEnabled(bool)));
- _exportAction = new TDEAction(i18n("&Export..."), 0, 0, TQT_TQOBJECT(this),
+ _exportAction = new TDEAction(i18n("&Export..."), 0, 0, this,
TQT_SLOT(exportXML()), actionCollection(),
"export");
connect(this, TQT_SIGNAL(enableWalletActions(bool)),
_exportAction, TQT_SLOT(setEnabled(bool)));
- _saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
+ _saveAsAction = KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
connect(this, TQT_SIGNAL(enableWalletActions(bool)),
_saveAsAction, TQT_SLOT(setEnabled(bool)));
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+ KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
emit enableWalletActions(false);
diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp
index 4f7d824..8bc0b20 100644
--- a/tdewallet/tdewalletmanager.cpp
+++ b/tdewallet/tdewalletmanager.cpp
@@ -84,8 +84,8 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f)
}
_iconView = new TDEWalletIconView(this, "tdewalletmanager icon view");
- connect(_iconView, TQT_SIGNAL(executed(TQIconViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(openWallet(TQIconViewItem*)));
- connect(_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQIconViewItem*, const TQPoint&)));
+ connect(_iconView, TQT_SIGNAL(executed(TQIconViewItem*)), this, TQT_SLOT(openWallet(TQIconViewItem*)));
+ connect(_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQT_SLOT(contextMenu(TQIconViewItem*, const TQPoint&)));
updateWalletDisplay();
setCentralWidget(_iconView);
@@ -112,28 +112,28 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f)
// wallet closes before we are done opening. We will then stay
// open. Must check that a wallet is still open here.
- new TDEAction(i18n("&New Wallet..."), "tdewalletmanager", 0, TQT_TQOBJECT(this),
+ new TDEAction(i18n("&New Wallet..."), "tdewalletmanager", 0, this,
TQT_SLOT(createWallet()), actionCollection(),
"wallet_create");
TDEAction *act = new TDEAction(i18n("Configure &Wallet..."), "configure",
- 0, TQT_TQOBJECT(this), TQT_SLOT(setupWallet()), actionCollection(),
+ 0, this, TQT_SLOT(setupWallet()), actionCollection(),
"wallet_settings");
if (_tray) {
act->plug(_tray->contextMenu());
}
- act = new TDEAction(i18n("Close &All Wallets"), 0, 0, TQT_TQOBJECT(this),
+ act = new TDEAction(i18n("Close &All Wallets"), 0, 0, this,
TQT_SLOT(closeAllWallets()), actionCollection(),
"close_all_wallets");
if (_tray) {
act->plug(_tray->contextMenu());
}
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(shuttingDown()), actionCollection());
+ KStdAction::quit(this, TQT_SLOT(shuttingDown()), actionCollection());
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
createGUI("tdewalletmanager.rc");
- accel->connectItem(accel->insertItem(Key_Return), TQT_TQOBJECT(this), TQT_SLOT(openWallet()));
- accel->connectItem(accel->insertItem(Key_Delete), TQT_TQOBJECT(this), TQT_SLOT(deleteWallet()));
+ accel->connectItem(accel->insertItem(Key_Return), this, TQT_SLOT(openWallet()));
+ accel->connectItem(accel->insertItem(Key_Delete), this, TQT_SLOT(deleteWallet()));
if (_tray) {
_tray->show();
@@ -208,11 +208,11 @@ TQPtrStack<TQIconViewItem> trash;
void TDEWalletManager::contextMenu(TQIconViewItem *item, const TQPoint& pos) {
if (item) {
TQGuardedPtr<TDEWalletPopup> popupMenu = new TDEWalletPopup(item->text(), this);
- connect(popupMenu, TQT_SIGNAL(walletOpened(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(openWallet(const TQString&)));
- connect(popupMenu, TQT_SIGNAL(walletClosed(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(closeWallet(const TQString&)));
- connect(popupMenu, TQT_SIGNAL(walletDeleted(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(deleteWallet(const TQString&)));
- connect(popupMenu, TQT_SIGNAL(walletChangePassword(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(changeWalletPassword(const TQString&)));
- connect(popupMenu, TQT_SIGNAL(walletCreated()), TQT_TQOBJECT(this), TQT_SLOT(createWallet()));
+ connect(popupMenu, TQT_SIGNAL(walletOpened(const TQString&)), this, TQT_SLOT(openWallet(const TQString&)));
+ connect(popupMenu, TQT_SIGNAL(walletClosed(const TQString&)), this, TQT_SLOT(closeWallet(const TQString&)));
+ connect(popupMenu, TQT_SIGNAL(walletDeleted(const TQString&)), this, TQT_SLOT(deleteWallet(const TQString&)));
+ connect(popupMenu, TQT_SIGNAL(walletChangePassword(const TQString&)), this, TQT_SLOT(changeWalletPassword(const TQString&)));
+ connect(popupMenu, TQT_SIGNAL(walletCreated()), this, TQT_SLOT(createWallet()));
popupMenu->exec(pos);
delete popupMenu;
}
diff --git a/tdewallet/tdewalletpopup.cpp b/tdewallet/tdewalletpopup.cpp
index 92cbe40..e4939cc 100644
--- a/tdewallet/tdewalletpopup.cpp
+++ b/tdewallet/tdewalletpopup.cpp
@@ -34,15 +34,15 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c
TDEActionCollection *ac = new TDEActionCollection(this, "tdewallet context actions");
TDEAction *act;
- act = new TDEAction(i18n("&New Wallet..."), 0, 0, TQT_TQOBJECT(this),
+ act = new TDEAction(i18n("&New Wallet..."), 0, 0, this,
TQT_SLOT(createWallet()), ac, "wallet_create");
act->plug(this);
- act = new TDEAction(i18n("&Open..."), 0, Key_Return, TQT_TQOBJECT(this),
+ act = new TDEAction(i18n("&Open..."), 0, Key_Return, this,
TQT_SLOT(openWallet()), ac, "wallet_open");
act->plug(this);
- act = new TDEAction(i18n("Change &Password..."), 0, 0, TQT_TQOBJECT(this),
+ act = new TDEAction(i18n("Change &Password..."), 0, 0, this,
TQT_SLOT(changeWalletPassword()), ac, "wallet_password");
act->plug(this);
@@ -60,14 +60,14 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c
insertItem(i18n("Disconnec&t"), pm);
}
- act = KStdAction::close( TQT_TQOBJECT(this),
+ act = KStdAction::close( this,
TQT_SLOT(closeWallet()), ac, "wallet_close");
// FIXME: let's track this inside the manager so we don't need a dcop
// roundtrip here.
act->setEnabled(TDEWallet::Wallet::isOpen(wallet));
act->plug(this);
- act = new TDEAction(i18n("&Delete"), 0, Key_Delete, TQT_TQOBJECT(this),
+ act = new TDEAction(i18n("&Delete"), 0, Key_Delete, this,
TQT_SLOT(deleteWallet()), ac, "wallet_delete");
act->plug(this);
}