diff options
Diffstat (limited to 'kexi/core')
-rw-r--r-- | kexi/core/kexiactionproxy.cpp | 6 | ||||
-rw-r--r-- | kexi/core/kexicontexthelp.cpp | 4 | ||||
-rw-r--r-- | kexi/core/kexidialogbase.cpp | 2 | ||||
-rw-r--r-- | kexi/core/kexipart.cpp | 8 | ||||
-rw-r--r-- | kexi/core/kexisharedactionhost.cpp | 4 | ||||
-rw-r--r-- | kexi/core/kexiuseraction.cpp | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp index fd3e2b2c..fd749b9f 100644 --- a/kexi/core/kexiactionproxy.cpp +++ b/kexi/core/kexiactionproxy.cpp @@ -159,7 +159,7 @@ TDEAction* KexiActionProxy::plugSharedAction(const char *action_name, const TQSt altName += "_alt"; TDEAction *alt_act = new TDEAction(alternativeText, a->iconSet(), a->shortcut(), 0, 0, a->parent(), altName); - TQObject::connect(alt_act, TQT_SIGNAL(activated()), a, TQT_SLOT(activate())); + TQObject::connect(alt_act, TQ_SIGNAL(activated()), a, TQ_SLOT(activate())); alt_act->plug(w); //OK? @@ -173,12 +173,12 @@ void KexiActionProxy::plugSharedActionToExternalGUI(const char *action_name, KXM TDEAction *a = client->action(action_name); if (!a) return; - plugSharedAction(a->name(), a, TQT_SLOT(activate())); + plugSharedAction(a->name(), a, TQ_SLOT(activate())); //update availability setAvailable(a->name(), a->isEnabled()); //changes will be signaled - TQObject::connect(a, TQT_SIGNAL(enabled(bool)), m_TDEAction_setEnabled_helper, TQT_SLOT(slotSetEnabled(bool))); + TQObject::connect(a, TQ_SIGNAL(enabled(bool)), m_TDEAction_setEnabled_helper, TQ_SLOT(slotSetEnabled(bool))); } void KexiActionProxy::plugSharedActionsToExternalGUI( diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp index 627bd761..cca089b3 100644 --- a/kexi/core/kexicontexthelp.cpp +++ b/kexi/core/kexicontexthelp.cpp @@ -33,8 +33,8 @@ KexiContextHelp::KexiContextHelp(KexiMainWindow *view, TQWidget *parent) kdDebug()<<"KexiContextHelp::KexiContextHelp()"<<endl; setCaption(i18n("Context Help")); setIcon(SmallIcon("help")); - connect(this,TQT_SIGNAL(linkClicked( const TQString& )), - this,TQT_SLOT(linkClickedInternal( const TQString& ))); + connect(this,TQ_SIGNAL(linkClicked( const TQString& )), + this,TQ_SLOT(linkClickedInternal( const TQString& ))); } void KexiContextHelp::linkClickedInternal(const TQString& link) { diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp index f8067ddd..c570a50e 100644 --- a/kexi/core/kexidialogbase.cpp +++ b/kexi/core/kexidialogbase.cpp @@ -395,7 +395,7 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr m_stack->raiseWidget( newView ); newView->propertySetSwitched(); m_parentWindow->invalidateSharedActions( newView ); - TQTimer::singleShot(10, newView, TQT_SLOT(setFocus())); //newView->setFocus(); //js ok? + TQTimer::singleShot(10, newView, TQ_SLOT(setFocus())); //newView->setFocus(); //js ok? // setFocus(); return true; } diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp index 48b4f9f0..21c636c0 100644 --- a/kexi/core/kexipart.cpp +++ b/kexi/core/kexipart.cpp @@ -127,11 +127,11 @@ void Part::createGUIClients(KexiMainWindow *win) //default actions for part's gui client: TDEAction *act = new TDEAction(m_names["instanceCaption"]+"...", info()->createItemIcon(), 0, this, - TQT_SLOT(slotCreate()), m_mainWin->actionCollection(), + TQ_SLOT(slotCreate()), m_mainWin->actionCollection(), KexiPart::nameForCreateAction(*info())); act->plug( m_mainWin->findPopupMenu("insert") ); // new TDEAction(m_names["instance"]+"...", info()->itemIcon(), 0, this, -// TQT_SLOT(create()), m_guiClient->actionCollection(), (info()->objectName()+"part_create").latin1()); +// TQ_SLOT(create()), m_guiClient->actionCollection(), (info()->objectName()+"part_create").latin1()); //let init specific actions for parts // initPartActions( m_guiClient->actionCollection() ); m_mainWin->guiFactory()->addClient(m_guiClient); //this client is added permanently @@ -439,10 +439,10 @@ GUIClient::GUIClient(KexiMainWindow *win, Part* part, bool partInstanceClient, c +"part"+(partInstanceClient?"inst":"")+"ui.rc"); // new TDEAction(part->m_names["new"], part->info()->itemIcon(), 0, this, -// TQT_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1()); +// TQ_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1()); // new TDEAction(i18nInstanceName+"...", part->info()->itemIcon(), 0, this, -// TQT_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1()); +// TQ_SLOT(create()), actionCollection(), (part->info()->objectName()+"part_create").latin1()); // win->guiFactory()->addClient(this); } diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp index 5370ba57..31100b6f 100644 --- a/kexi/core/kexisharedactionhost.cpp +++ b/kexi/core/kexisharedactionhost.cpp @@ -37,7 +37,7 @@ KexiSharedActionHostPrivate::KexiSharedActionHostPrivate(KexiSharedActionHost *h , host(h) { volatileActions.setAutoDelete(true); - connect(&actionMapper, TQT_SIGNAL(mapped(const TQString &)), this, TQT_SLOT(slotAction(const TQString &))); + connect(&actionMapper, TQ_SIGNAL(mapped(const TQString &)), this, TQ_SLOT(slotAction(const TQString &))); } void KexiSharedActionHostPrivate::slotAction(const TQString& act_id) @@ -214,7 +214,7 @@ TQWidget* KexiSharedActionHost::focusWindow() TDEAction* KexiSharedActionHost::createSharedActionInternal( TDEAction *action ) { - TQObject::connect(action,TQT_SIGNAL(activated()), &d->actionMapper, TQT_SLOT(map())); + TQObject::connect(action,TQ_SIGNAL(activated()), &d->actionMapper, TQ_SLOT(map())); d->actionMapper.setMapping(action, action->name()); d->sharedActions.append( action ); return action; diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp index ad97123e..994bbd56 100644 --- a/kexi/core/kexiuseraction.cpp +++ b/kexi/core/kexiuseraction.cpp @@ -12,11 +12,11 @@ #include "kexiuseraction.h" KexiUserAction::KexiUserAction(KexiMainWindow *win, TDEActionCollection *parent, const TQString &name, const TQString &text, const TQString &pixmap) - : TDEAction(text, pixmap, TDEShortcut::null(), this, TQT_SLOT(execute()), parent, name.latin1()) + : TDEAction(text, pixmap, TDEShortcut::null(), this, TQ_SLOT(execute()), parent, name.latin1()) { m_win = win; m_method = 0; - connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(execute())); + connect(this, TQ_SIGNAL(activated()), this, TQ_SLOT(execute())); } void |