diff options
Diffstat (limited to 'kimagemapeditor/kimeshell.cpp')
| -rw-r--r-- | kimagemapeditor/kimeshell.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index 0cbcd542..2c69ab22 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -54,7 +54,7 @@ KimeShell::KimeShell(const char *name ) mainDock->setEnableDocking(KDockWidget::DockNone); setView( mainDock); // central widget in a KDE mainwindow setMainDockWidget( mainDock); // master dockwidget - m_part = new KImageMapEditor( w, "kimagemapeditor", TQT_TQOBJECT(this), "kimagemapeditor"); + m_part = new KImageMapEditor( w, "kimagemapeditor", this, "kimagemapeditor"); // setCentralWidget( part->widget() ); @@ -73,11 +73,11 @@ KimeShell::KimeShell(const char *name ) if (!initialGeometrySet()) resize( TQSize(725, 525).expandedTo(minimumSizeHint())); - connect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)), - this, TQT_SLOT(slotSetStatusBarText ( const TQString & ))); + connect( m_part, TQ_SIGNAL(setStatusBarText(const TQString &)), + this, TQ_SLOT(slotSetStatusBarText ( const TQString & ))); - connect( m_part, TQT_SIGNAL(setWindowCaption(const TQString &)), - this, TQT_SLOT(setCaption( const TQString &))); + connect( m_part, TQ_SIGNAL(setWindowCaption(const TQString &)), + this, TQ_SLOT(setCaption( const TQString &))); setAutoSaveSettings( "General Options" ); @@ -91,7 +91,7 @@ KimeShell::~KimeShell() bool KimeShell::queryClose() { if (_stdout) { - std::cout << m_part->getHtmlCode() << std::endl; + std::cout << m_part->getHtmlCode().local8Bit() << std::endl; } return m_part->queryClose(); @@ -109,16 +109,16 @@ bool KimeShell::queryExit() void KimeShell::setupActions() { - (void)KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); + (void)KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); // File Quit - (void)KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()),actionCollection()); + (void)KStdAction::quit(this, TQ_SLOT(close()),actionCollection()); - (void)KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection()); - (void)KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - (void)KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection()); + (void)KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + (void)KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + (void)KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + (void)KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); } @@ -245,33 +245,33 @@ void KimeShell::optionsConfigureKeys() { } void KimeShell::optionsConfigureToolbars() -{ +{ #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else saveMainWindowSettings(TDEGlobal::config() ); # endif -#else +#else saveMainWindowSettings(TDEGlobal::config() ); #endif // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } void KimeShell::applyNewToolbarConfig() -{ +{ #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else applyMainWindowSettings(TDEGlobal::config()); # endif -#else +#else applyMainWindowSettings(TDEGlobal::config()); #endif } |