diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:14:58 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:14:58 -0600 |
commit | 9e5c87c89567a98c3344c90e392a27715437334c (patch) | |
tree | 6c1dd96ae0ba38b7e8f0a492d591881f44f474da /kedit | |
parent | 53904b41cf005abbae3d468532db9adc2b04a9b4 (diff) | |
download | tdeutils-9e5c87c89567a98c3344c90e392a27715437334c.tar.gz tdeutils-9e5c87c89567a98c3344c90e392a27715437334c.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kedit')
-rw-r--r-- | kedit/kedit.cpp | 10 | ||||
-rw-r--r-- | kedit/kedit.h | 16 | ||||
-rw-r--r-- | kedit/ktextfiledlg.cpp | 16 |
3 files changed, 21 insertions, 21 deletions
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp index dd59fa9..b2b3e79 100644 --- a/kedit/kedit.cpp +++ b/kedit/kedit.cpp @@ -61,7 +61,7 @@ TQPtrList<TopLevel> *TopLevel::windowList = 0; int default_open = TopLevel::OPEN_READWRITE; TopLevel::TopLevel (TQWidget *, const char *name) - : KMainWindow ( 0,name ), tdespellconfigOptions(0), + : TDEMainWindow ( 0,name ), tdespellconfigOptions(0), eframe(0), newWindow(false), tdespell(0) { if (!windowList) @@ -217,11 +217,11 @@ void TopLevel::setupActions() KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(search_again()), actionCollection()); KStdAction::replace(TQT_TQOBJECT(this), TQT_SLOT(replace()), actionCollection()); - (void)new KAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(file_insert()), + (void)new TDEAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(file_insert()), actionCollection(), "insert_file"); - (void)new KAction(i18n("In&sert Date"), 0, TQT_TQOBJECT(this), TQT_SLOT(insertDate()), + (void)new TDEAction(i18n("In&sert Date"), 0, TQT_TQOBJECT(this), TQT_SLOT(insertDate()), actionCollection(), "insert_date"); - (void)new KAction(i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(clean_space()), + (void)new TDEAction(i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(clean_space()), actionCollection(), "clean_spaces"); // setup Tools menu @@ -1324,7 +1324,7 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkele // Font TQWidget *font = new TQWidget(0, "FontSetting"); TQVBoxLayout *topLayout = new TQVBoxLayout(font, 0, KDialog::spacingHint()); - KFontChooser *mFontChooser = new KFontChooser(font, "kcfg_Font", false, TQStringList(), false, 6); + TDEFontChooser *mFontChooser = new TDEFontChooser(font, "kcfg_Font", false, TQStringList(), false, 6); topLayout->addWidget(mFontChooser); addPage(font, i18n("Font"), "fonts", i18n("Editor Font")); diff --git a/kedit/kedit.h b/kedit/kedit.h index b931615..30791c3 100644 --- a/kedit/kedit.h +++ b/kedit/kedit.h @@ -35,8 +35,8 @@ class KEdit; class KSpell; class KSpellConfig; class TQTimer; -class KAction; -class KRecentFilesAction; +class TDEAction; +class TDERecentFilesAction; namespace TDEIO { class Job; } @@ -45,7 +45,7 @@ namespace TDEIO { class Job; } #define ID_INS_OVR 2 #define ID_GENERAL 3 -class TopLevel : public KMainWindow +class TopLevel : public TDEMainWindow { Q_OBJECT @@ -128,11 +128,11 @@ private: bool newWindow; int statusID, toolID, indentID; TQTimer *statusbar_timer; - KRecentFilesAction *recent; - KAction *cutAction; - KAction *copyAction; - KAction *undoAction; - KAction *redoAction; + TDERecentFilesAction *recent; + TDEAction *cutAction; + TDEAction *copyAction; + TDEAction *undoAction; + TDEAction *redoAction; int open_mode; diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp index 47dbd07..3e1c4fe 100644 --- a/kedit/ktextfiledlg.cpp +++ b/kedit/ktextfiledlg.cpp @@ -38,7 +38,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir, { /* // insert encoding action into toolbar - KSelectAction *mEncoding = new KSelectAction( + TDESelectAction *mEncoding = new TDESelectAction( i18n( "Set &Encoding" ), 0, this, TQT_SLOT( slotSetEncoding() ), this, "encoding" ); @@ -57,17 +57,17 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir, i++; } - KToolBar *tb = toolBar(); + TDEToolBar *tb = toolBar(); mEncoding->plug( tb, 7 ); */ - KAction* mEncoding = new KAction( + TDEAction* mEncoding = new TDEAction( i18n("Select Encoding..."), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowEncCombo() ), TQT_TQOBJECT(this), "encoding"); mEncoding->setIcon( TQString::fromLatin1("charset") ); - KToolBar *tb = toolBar(); + TDEToolBar *tb = toolBar(); mEncoding->plug( tb, pathComboIndex() - 1 ); } @@ -162,9 +162,9 @@ KURL KTextFileDialog::getOpenURLwithEncoding( KURL url = dlg.selectedURL(); if (url.isValid()) { if ( url.isLocalFile() ) - KRecentDocument::add( url.path(-1) ); + TDERecentDocument::add( url.path(-1) ); else - KRecentDocument::add( url.url(-1), true ); + TDERecentDocument::add( url.url(-1), true ); } // append encoding to the URL params @@ -191,9 +191,9 @@ KURL KTextFileDialog::getSaveURLwithEncoding( KURL url = dlg.selectedURL(); if (url.isValid()) { if ( url.isLocalFile() ) - KRecentDocument::add( url.path(-1) ); + TDERecentDocument::add( url.path(-1) ); else - KRecentDocument::add( url.url(-1) ); + TDERecentDocument::add( url.url(-1) ); } // append encoding to the URL params |