diff options
Diffstat (limited to 'kcharselect')
| -rw-r--r-- | kcharselect/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcharselect/Makefile.am | 4 | ||||
| -rw-r--r-- | kcharselect/kcharselectdia.cpp (renamed from kcharselect/kcharselectdia.cc) | 54 | ||||
| -rw-r--r-- | kcharselect/kcharselectdia.h | 2 | ||||
| -rw-r--r-- | kcharselect/main.cpp (renamed from kcharselect/main.cc) | 2 |
5 files changed, 32 insertions, 32 deletions
diff --git a/kcharselect/CMakeLists.txt b/kcharselect/CMakeLists.txt index cc3d6cf..1ccd750 100644 --- a/kcharselect/CMakeLists.txt +++ b/kcharselect/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( ##### kcharselect (executable) ################## tde_add_executable( kcharselect AUTOMOC - SOURCES kcharselectdia.cc main.cc + SOURCES kcharselectdia.cpp main.cpp LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcharselect/Makefile.am b/kcharselect/Makefile.am index 2cce07f..740200c 100644 --- a/kcharselect/Makefile.am +++ b/kcharselect/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = $(all_includes) LDADD = $(LIB_TDEFILE) bin_PROGRAMS = kcharselect -kcharselect_SOURCES = kcharselectdia.cc main.cc +kcharselect_SOURCES = kcharselectdia.cpp main.cpp kcharselect_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kcharselect_METASOURCES = kcharselectdia.moc @@ -17,5 +17,5 @@ rcdir = $(kde_datadir)/kcharselect rc_DATA = kcharselectui.rc messages: rc.cpp - $(XGETTEXT) *.cc *.cpp -o $(podir)/kcharselect.pot + $(XGETTEXT) *.cpp -o $(podir)/kcharselect.pot diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cpp index 8750b68..d5232a8 100644 --- a/kcharselect/kcharselectdia.cc +++ b/kcharselect/kcharselectdia.cpp @@ -36,12 +36,12 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name, // Add character selection widget from library tdeui charSelect = new KCharSelect(mainWidget,"",vFont,vChr,_tableNum); charSelect->resize(charSelect->sizeHint()); - connect(charSelect,TQT_SIGNAL(highlighted(const TQChar &)), - TQT_SLOT(charChanged(const TQChar &))); - connect(charSelect,TQT_SIGNAL(activated(const TQChar &)), - TQT_SLOT(add(const TQChar &))); - connect(charSelect,TQT_SIGNAL(fontChanged(const TQString &)), - TQT_SLOT(fontSelected(const TQString &))); + connect(charSelect,TQ_SIGNAL(highlighted(const TQChar &)), + TQ_SLOT(charChanged(const TQChar &))); + connect(charSelect,TQ_SIGNAL(activated(const TQChar &)), + TQ_SLOT(add(const TQChar &))); + connect(charSelect,TQ_SIGNAL(fontChanged(const TQString &)), + TQ_SLOT(fontSelected(const TQString &))); grid->addMultiCellWidget(charSelect, 0, 0, 0, 3); // Build line editor @@ -52,13 +52,13 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name, font.setFamily( vFont ); lined->setFont( font ); - connect(lined,TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(lineEditChanged())); + connect(lined,TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(lineEditChanged())); grid->addMultiCellWidget(lined, 1, 1, 0, 3); // Build some buttons bHelp = new KPushButton( KStdGuiItem::help(), mainWidget ); - connect(bHelp,TQT_SIGNAL(clicked()),this,TQT_SLOT(help())); + connect(bHelp,TQ_SIGNAL(clicked()),this,TQ_SLOT(help())); bHelp->setFixedSize( bHelp->sizeHint() ); grid->addWidget( bHelp, 2, 0 ); @@ -66,39 +66,39 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name, grid->addItem( space, 2, 1 ); bClear = new KPushButton( KStdGuiItem::clear(), mainWidget ); - connect(bClear,TQT_SIGNAL(clicked()),this,TQT_SLOT(clear())); + connect(bClear,TQ_SIGNAL(clicked()),this,TQ_SLOT(clear())); bClear->setFixedSize( bClear->sizeHint() ); grid->addWidget( bClear, 2, 2 ); bClip = new KPushButton( KGuiItem( i18n( "&To Clipboard" ), "edit-copy" ), mainWidget ); bClip->setFixedSize( bClip->sizeHint() ); - connect(bClip,TQT_SIGNAL(clicked()),this,TQT_SLOT(toClip())); + connect(bClip,TQ_SIGNAL(clicked()),this,TQ_SLOT(toClip())); grid->addWidget( bClip, 2, 3 ); // Build menu - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(_exit()), actionCollection() ); + KStdAction::quit( this, TQ_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, TQ_SLOT(toClip()), actionCollection(), "copy_clip" ); - (void)new TDEAction(i18n("To Clipboard &UTF-8"), 0, TQT_TQOBJECT(this), - TQT_SLOT(toClipUTF8()), actionCollection(), "copy_utf_8" ); - (void)new TDEAction(i18n("To Clipboard &HTML"), 0, TQT_TQOBJECT(this), - TQT_SLOT(toClipHTML()), actionCollection(), "copy_html" ); + (void)new TDEAction(i18n("To Clipboard &UTF-8"), 0, this, + TQ_SLOT(toClipUTF8()), actionCollection(), "copy_utf_8" ); + (void)new TDEAction(i18n("To Clipboard &HTML"), 0, this, + TQ_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), - TQT_SLOT(fromClipUTF8()), actionCollection(), "from_clip_utf8" ); + TDEStdAccel::shortcut(TDEStdAccel::Paste), this, TQ_SLOT(fromClip()), actionCollection(), "from_clip" ); + (void)new TDEAction(i18n("From Clipboard UTF-8"), 0, this, + TQ_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), - TQT_SLOT(flipText()), actionCollection(), "flip" ); - (void)new TDEAction(i18n("&Alignment"), 0, TQT_TQOBJECT(this), - TQT_SLOT(toggleEntryDirection()), actionCollection(), "alignment" ); + KStdAction::clear(this, TQ_SLOT(clear()), actionCollection(), "clear"); + (void)new TDEAction(i18n("&Flip"), 0, this, + TQ_SLOT(flipText()), actionCollection(), "flip" ); + (void)new TDEAction(i18n("&Alignment"), 0, this, + TQ_SLOT(toggleEntryDirection()), actionCollection(), "alignment" ); charSelect->setFocus(); @@ -262,7 +262,7 @@ void KCharSelectDia::lineEditChanged() //================================================================== void KCharSelectDia::_exit() { - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); config->writeEntry("selectedFont",vFont); @@ -284,6 +284,6 @@ void KCharSelectDia::clear() //================================================================== void KCharSelectDia::help() { - kapp->invokeHelp(); + tdeApp->invokeHelp(); } diff --git a/kcharselect/kcharselectdia.h b/kcharselect/kcharselectdia.h index 62f07c2..c2b3742 100644 --- a/kcharselect/kcharselectdia.h +++ b/kcharselect/kcharselectdia.h @@ -24,7 +24,7 @@ static const char *version = "v1.1"; class KCharSelectDia : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcharselect/main.cc b/kcharselect/main.cpp index cb74af5..a863e5e 100644 --- a/kcharselect/main.cc +++ b/kcharselect/main.cpp @@ -31,7 +31,7 @@ int main(int argc, char **argv) TDEApplication app; - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); TQString font(config->readEntry("selectedFont", TDEGlobalSettings::generalFont().family())); |