Browse Source

Rename a number of classes to enhance compatibility with KDE4

Timothy Pearson 6 years ago
parent
commit
9791ea5701
63 changed files with 607 additions and 607 deletions
  1. 3
    3
      ChangeLog
  2. 5
    5
      bibletime/bibletime.cpp
  3. 31
    31
      bibletime/bibletime.h
  4. 31
    31
      bibletime/bibletime_init.cpp
  5. 16
    16
      bibletime/bibletime_slots.cpp
  6. 2
    2
      bibletime/frontend/cbtconfig.cpp
  7. 4
    4
      bibletime/frontend/cbtconfig.h
  8. 1
    1
      bibletime/frontend/cmdiarea.h
  9. 7
    7
      bibletime/frontend/coptionsdialog.cpp
  10. 5
    5
      bibletime/frontend/coptionsdialog.h
  11. 1
    1
      bibletime/frontend/cswordsetupmodulelistview.cpp
  12. 1
    1
      bibletime/frontend/cswordsetupmodulelistview.h
  13. 14
    14
      bibletime/frontend/display/chtmlwritedisplay.cpp
  14. 13
    13
      bibletime/frontend/display/chtmlwritedisplay.h
  15. 1
    1
      bibletime/frontend/display/cplainwritedisplay.cpp
  16. 2
    2
      bibletime/frontend/display/cplainwritedisplay.h
  17. 3
    3
      bibletime/frontend/display/cwritedisplay.h
  18. 39
    39
      bibletime/frontend/displaywindow/cbiblereadwindow.cpp
  19. 17
    17
      bibletime/frontend/displaywindow/cbiblereadwindow.h
  20. 13
    13
      bibletime/frontend/displaywindow/cbookreadwindow.cpp
  21. 3
    3
      bibletime/frontend/displaywindow/cbookreadwindow.h
  22. 4
    4
      bibletime/frontend/displaywindow/cbuttons.cpp
  23. 5
    5
      bibletime/frontend/displaywindow/cbuttons.h
  24. 14
    14
      bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
  25. 2
    2
      bibletime/frontend/displaywindow/ccommentaryreadwindow.h
  26. 14
    14
      bibletime/frontend/displaywindow/cdisplaywindow.cpp
  27. 15
    15
      bibletime/frontend/displaywindow/cdisplaywindow.h
  28. 6
    6
      bibletime/frontend/displaywindow/chtmlwritewindow.cpp
  29. 5
    5
      bibletime/frontend/displaywindow/chtmlwritewindow.h
  30. 31
    31
      bibletime/frontend/displaywindow/clexiconreadwindow.cpp
  31. 19
    19
      bibletime/frontend/displaywindow/clexiconreadwindow.h
  32. 1
    1
      bibletime/frontend/displaywindow/cmodulechooserbar.cpp
  33. 1
    1
      bibletime/frontend/displaywindow/cmodulechooserbar.h
  34. 7
    7
      bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
  35. 4
    4
      bibletime/frontend/displaywindow/cmodulechooserbutton.h
  36. 6
    6
      bibletime/frontend/displaywindow/cplainwritewindow.cpp
  37. 8
    8
      bibletime/frontend/displaywindow/cplainwritewindow.h
  38. 1
    1
      bibletime/frontend/displaywindow/creadwindow.cpp
  39. 3
    3
      bibletime/frontend/displaywindow/creadwindow.h
  40. 3
    3
      bibletime/frontend/displaywindow/cwritewindow.cpp
  41. 1
    1
      bibletime/frontend/displaywindow/cwritewindow.h
  42. 6
    6
      bibletime/frontend/keychooser/cbooktreechooser.cpp
  43. 2
    2
      bibletime/frontend/keychooser/cbooktreechooser.h
  44. 5
    5
      bibletime/frontend/mainindex/cindexitem.cpp
  45. 1
    1
      bibletime/frontend/mainindex/cindexitem.h
  46. 32
    32
      bibletime/frontend/mainindex/cmainindex.cpp
  47. 19
    19
      bibletime/frontend/mainindex/cmainindex.h
  48. 1
    1
      bibletime/frontend/manageindicesform.cpp
  49. 1
    1
      bibletime/frontend/manageindicesform.ui
  50. 2
    2
      bibletime/frontend/searchdialog/cmodulechooser.cpp
  51. 1
    1
      bibletime/frontend/searchdialog/cmodulechooser.h
  52. 13
    13
      bibletime/frontend/searchdialog/cmoduleresultview.cpp
  53. 14
    14
      bibletime/frontend/searchdialog/cmoduleresultview.h
  54. 5
    5
      bibletime/frontend/searchdialog/crangechooser.cpp
  55. 3
    3
      bibletime/frontend/searchdialog/crangechooser.h
  56. 3
    3
      bibletime/frontend/searchdialog/csearchdialogpages.h
  57. 19
    19
      bibletime/frontend/searchdialog/csearchresultview.cpp
  58. 14
    14
      bibletime/frontend/searchdialog/csearchresultview.h
  59. 9
    9
      bibletime/frontend/util/csortlistviewitem.cpp
  60. 1
    1
      bibletime/frontend/util/csortlistviewitem.h
  61. 2
    2
      bibletime/main.cpp
  62. 46
    46
      bibletime/util/cresmgr.cpp
  63. 46
    46
      bibletime/util/cresmgr.h

+ 3
- 3
ChangeLog View File

@@ -423,7 +423,7 @@
423 423
 
424 424
 2003-01-18 Joachim Ansorg <junkmail@joachim.ansorgs.de>
425 425
   * Removed install instructions from CResMgr and the actions XML file
426
-  * Fixed missing insertion of KAction objects into our KAccel object
426
+  * Fixed missing insertion of TDEAction objects into our TDEAccel object
427 427
 
428 428
 2003-01-17 Joachim Ansorg <junkmail@joachim.ansorgs.de>
429 429
   * Removed installation instructions, the webpage and README/INSTALL files are good enough
@@ -704,7 +704,7 @@
704 704
 
705 705
 1999-12-19 	Joachim Ansorg <Jockel123@gmx.de>
706 706
 	*Fontmanagementdialog uses now a XFonts list, not the list provided by KDE. This solves the problems on
707
-	systems without KFontManager
707
+	systems without TDEFontManager
708 708
 	*Added files global.h and global.cpp which should contain global functions
709 709
 	*Fixed some typos in the german translation
710 710
 
@@ -850,7 +850,7 @@
850 850
 	*Added some text to the handbook
851 851
 	*Removed the german index.sgml file, because it makes no senss.
852 852
 	 We will add this if the english one is ready to translate it into german.
853
-	*Cleaned up KListView::addChildItem()
853
+	*Cleaned up TDEListView::addChildItem()
854 854
 	*Finished dialog of the link manager, needs implementation of functions to work
855 855
 
856 856
 1999-10-05 	Joachim Ansorg <Jockel123@gmx.de>

+ 5
- 5
bibletime/bibletime.cpp View File

@@ -56,9 +56,9 @@ using namespace Profile;
56 56
 BibleTime::BibleTime()
57 57
 : BibleTimeInterface("BibleTimeInterface"),
58 58
 #if TDE_VERSION >= 0x030200
59
-KMainWindow(KMainWindow::NoDCOPObject, 0,0, WType_TopLevel),
59
+TDEMainWindow(TDEMainWindow::NoDCOPObject, 0,0, WType_TopLevel),
60 60
 #else
61
-KMainWindow(0,0, WType_TopLevel),
61
+TDEMainWindow(0,0, WType_TopLevel),
62 62
 #endif
63 63
 m_windowActionCollection(0),
64 64
 m_initialized(false),
@@ -277,12 +277,12 @@ void BibleTime::restoreWorkspace() {
277 277
 
278 278
 /** Sets the caption of the mainwindow */
279 279
 void BibleTime::setCaption( const TQString& ) {
280
-	KMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
280
+	TDEMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
281 281
 }
282 282
 
283 283
 /** Sets the plain caption of the main window */
284 284
 void BibleTime::setPlainCaption( const TQString& ) {
285
-	KMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
285
+	TDEMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
286 286
 }
287 287
 
288 288
 /** Processes the commandline options given to BibleTime. */
@@ -323,7 +323,7 @@ void BibleTime::processCommandline() {
323 323
 void BibleTime::polish() {
324 324
 	m_initialized = true;
325 325
 
326
-	KMainWindow::polish();
326
+	TDEMainWindow::polish();
327 327
 	applyMainWindowSettings(CBTConfig::getConfig(), TQString::fromLatin1("MainWindow"));
328 328
 }
329 329
 

+ 31
- 31
bibletime/bibletime.h View File

@@ -36,12 +36,12 @@ namespace InfoDisplay {
36 36
 }
37 37
 
38 38
 //KDE classes
39
-class KToggleAction;
40
-class KAccel;
41
-class KPopupMenu;
42
-class KAction;
43
-class KActionMenu;
44
-class KActionCollection;
39
+class TDEToggleAction;
40
+class TDEAccel;
41
+class TDEPopupMenu;
42
+class TDEAction;
43
+class TDEActionMenu;
44
+class TDEActionCollection;
45 45
 
46 46
 //QT classes
47 47
 class TQPopupMenu;
@@ -125,14 +125,14 @@ class TQSplitter;
125 125
 /** BibleTime's main class.
126 126
  * The main class of BibleTime. Here are the main widgets created.
127 127
  *
128
- * This is the main class of BibleTime! This class creates the GUI, the KAction objects
128
+ * This is the main class of BibleTime! This class creates the GUI, the TDEAction objects
129 129
  * and connects to some slots. Please insert the creation of actions in initActions,
130 130
  * the creation of widgets into initView and the connect(...) calls into initConnections.
131 131
  * Reading from a config file on creation time should go into readSettings(), saving into
132 132
  * saveSettings().
133 133
  * This is the general way of all BibleTime classes.
134 134
  */
135
-class BibleTime : public KMainWindow, virtual public BibleTimeInterface {
135
+class BibleTime : public TDEMainWindow, virtual public BibleTimeInterface {
136 136
 	friend class CMDIArea;
137 137
 	Q_OBJECT
138 138
   
@@ -267,7 +267,7 @@ protected slots:
267 267
 	 * This slot is connected with the windowAutoCascade_action object
268 268
 	 */
269 269
 	void slotAutoCascade();
270
-	void slotUpdateWindowArrangementActions( KAction* );
270
+	void slotUpdateWindowArrangementActions( TDEAction* );
271 271
 
272 272
 	void slotCascade();
273 273
 	void slotTileVertical();
@@ -352,30 +352,30 @@ private:
352 352
 	TQPopupMenu* m_editMenu;
353 353
 
354 354
 	/** VIEW menu actions */
355
-	KToggleAction* m_viewToolbar_action;
356
-	KToggleAction* m_viewMainIndex_action;
357
-	KToggleAction* m_viewInfoDisplay_action;
355
+	TDEToggleAction* m_viewToolbar_action;
356
+	TDEToggleAction* m_viewMainIndex_action;
357
+	TDEToggleAction* m_viewInfoDisplay_action;
358 358
 
359 359
 	/** WINDOW menu actions */
360
-	KAction* m_windowCascade_action;
361
-	KAction* m_windowTileHorizontal_action;
362
-	KAction* m_windowTileVertical_action;
363
-	KActionMenu* m_windowArrangementMode_action;
364
-	KToggleAction* m_windowManualMode_action;
365
-	KToggleAction* m_windowAutoCascade_action;
366
-	KToggleAction* m_windowAutoTileVertical_action;
367
-	KToggleAction* m_windowAutoTileHorizontal_action;
368
-	KAction* m_windowCloseAll_action;
369
-
370
-	KActionCollection* m_windowActionCollection;
371
-
372
-	KActionMenu* m_windowSaveProfile_action;
373
-	KAction* m_windowSaveToNewProfile_action;
374
-	KActionMenu* m_windowLoadProfile_action;
375
-	KActionMenu* m_windowDeleteProfile_action;
376
-	KToggleAction* m_windowFullscreen_action;
377
-
378
-	TQPtrList<KAction> m_windowOpenWindowsList;
360
+	TDEAction* m_windowCascade_action;
361
+	TDEAction* m_windowTileHorizontal_action;
362
+	TDEAction* m_windowTileVertical_action;
363
+	TDEActionMenu* m_windowArrangementMode_action;
364
+	TDEToggleAction* m_windowManualMode_action;
365
+	TDEToggleAction* m_windowAutoCascade_action;
366
+	TDEToggleAction* m_windowAutoTileVertical_action;
367
+	TDEToggleAction* m_windowAutoTileHorizontal_action;
368
+	TDEAction* m_windowCloseAll_action;
369
+
370
+	TDEActionCollection* m_windowActionCollection;
371
+
372
+	TDEActionMenu* m_windowSaveProfile_action;
373
+	TDEAction* m_windowSaveToNewProfile_action;
374
+	TDEActionMenu* m_windowLoadProfile_action;
375
+	TDEActionMenu* m_windowDeleteProfile_action;
376
+	TDEToggleAction* m_windowFullscreen_action;
377
+
378
+	TQPtrList<TDEAction> m_windowOpenWindowsList;
379 379
 
380 380
 	KHelpMenu* m_helpMenu;
381 381
 

+ 31
- 31
bibletime/bibletime_init.cpp View File

@@ -102,7 +102,7 @@ void BibleTime::initView() {
102 102
 /** Initializes the action objects of the GUI */
103 103
 void BibleTime::initActions() {
104 104
 	TDEStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + TQString("..."));
105
-	KAction* action = 0;
105
+	TDEAction* action = 0;
106 106
 
107 107
 	action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection());
108 108
 	action->setToolTip( CResMgr::mainMenu::file::quit::tooltip );
@@ -112,7 +112,7 @@ void BibleTime::initActions() {
112 112
 	action->plugAccel( accel() );
113 113
 	#endif
114 114
 
115
-	action = new KAction(i18n("Search in &open work(s)"),
115
+	action = new TDEAction(i18n("Search in &open work(s)"),
116 116
 						 CResMgr::mainMenu::mainIndex::search::icon,
117 117
 						 CResMgr::mainMenu::mainIndex::search::accel,
118 118
 						 TQT_TQOBJECT(this), TQT_SLOT(slotSearchModules()), actionCollection(),
@@ -125,7 +125,7 @@ void BibleTime::initActions() {
125 125
 	action->plugAccel( accel() );
126 126
 	#endif
127 127
 
128
-	action = new KAction(i18n("Search in standard &Bible"),
128
+	action = new TDEAction(i18n("Search in standard &Bible"),
129 129
 						 CResMgr::mainMenu::mainIndex::searchdefaultbible::icon,
130 130
 						 CResMgr::mainMenu::mainIndex::searchdefaultbible::accel,
131 131
 						 TQT_TQOBJECT(this), TQT_SLOT(slotSearchDefaultBible()), actionCollection(),
@@ -147,7 +147,7 @@ void BibleTime::initActions() {
147 147
 	#endif
148 148
 
149 149
 
150
-	m_viewMainIndex_action = new KToggleAction(i18n("&Show bookshelf"),
150
+	m_viewMainIndex_action = new TDEToggleAction(i18n("&Show bookshelf"),
151 151
 							 CResMgr::mainMenu::view::showMainIndex::icon,
152 152
 							 CResMgr::mainMenu::view::showMainIndex::accel,
153 153
 							 TQT_TQOBJECT(this), TQT_SLOT(slotToggleMainIndex()), actionCollection(),
@@ -159,7 +159,7 @@ void BibleTime::initActions() {
159 159
 	m_viewMainIndex_action->plugAccel( accel() );
160 160
 	#endif
161 161
 
162
-	m_viewInfoDisplay_action = new KToggleAction(i18n("Show &mag"),
162
+	m_viewInfoDisplay_action = new TDEToggleAction(i18n("Show &mag"),
163 163
 							   CResMgr::mainMenu::view::showInfoDisplay::icon,
164 164
 							   CResMgr::mainMenu::view::showInfoDisplay::accel,
165 165
 							   TQT_TQOBJECT(this), TQT_SLOT(slotToggleInfoDisplay()), actionCollection(),
@@ -179,7 +179,7 @@ void BibleTime::initActions() {
179 179
 	action->plugAccel( accel() );
180 180
 	#endif
181 181
 
182
-	action = new KAction(i18n("Bookshelf &Manager"),
182
+	action = new TDEAction(i18n("Bookshelf &Manager"),
183 183
 						 CResMgr::mainMenu::settings::swordSetupDialog::icon,
184 184
 						 CResMgr::mainMenu::settings::swordSetupDialog::accel,
185 185
 						 TQT_TQOBJECT(this), TQT_SLOT( slotSwordSetupDialog() ), actionCollection(),
@@ -205,13 +205,13 @@ void BibleTime::initActions() {
205 205
 	action->plugAccel( accel() );
206 206
 	#endif
207 207
 
208
-	m_windowArrangementMode_action = new KActionMenu(i18n("&Arrangement mode"),
208
+	m_windowArrangementMode_action = new TDEActionMenu(i18n("&Arrangement mode"),
209 209
 							 CResMgr::mainMenu::window::arrangementMode::icon,
210 210
 							 actionCollection(),
211 211
 							 CResMgr::mainMenu::window::arrangementMode::actionName);
212 212
 	m_windowArrangementMode_action->setDelayed( false );
213 213
 
214
-	m_windowManualMode_action = new KToggleAction(i18n("&Manual mode"),
214
+	m_windowManualMode_action = new TDEToggleAction(i18n("&Manual mode"),
215 215
 								CResMgr::mainMenu::window::arrangementMode::manual::icon,
216 216
 								CResMgr::mainMenu::window::arrangementMode::manual::accel,
217 217
 								TQT_TQOBJECT(this), TQT_SLOT(slotManualArrangementMode()), actionCollection(),
@@ -228,7 +228,7 @@ void BibleTime::initActions() {
228 228
 	m_windowArrangementMode_action->insert( m_windowManualMode_action );
229 229
 
230 230
 
231
-	m_windowAutoTileVertical_action = new KToggleAction(i18n("Auto-tile &vertically"),
231
+	m_windowAutoTileVertical_action = new TDEToggleAction(i18n("Auto-tile &vertically"),
232 232
 									  CResMgr::mainMenu::window::arrangementMode::autoTileVertical::icon,
233 233
 									  CResMgr::mainMenu::window::arrangementMode::autoTileVertical::accel,
234 234
 									  TQT_TQOBJECT(this), TQT_SLOT(slotAutoTileVertical()), actionCollection(),
@@ -245,7 +245,7 @@ void BibleTime::initActions() {
245 245
 	m_windowArrangementMode_action->insert( m_windowAutoTileVertical_action );
246 246
 
247 247
 
248
-	m_windowAutoTileHorizontal_action = new KToggleAction(i18n("Auto-tile &horizontally"),
248
+	m_windowAutoTileHorizontal_action = new TDEToggleAction(i18n("Auto-tile &horizontally"),
249 249
 										CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::icon,
250 250
 										CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::accel,
251 251
 										TQT_TQOBJECT(this), TQT_SLOT(slotAutoTileHorizontal()), actionCollection(),
@@ -262,7 +262,7 @@ void BibleTime::initActions() {
262 262
 	m_windowArrangementMode_action->insert( m_windowAutoTileHorizontal_action );
263 263
 
264 264
 
265
-	m_windowAutoCascade_action  = new KToggleAction(i18n("Auto-&cascade"),
265
+	m_windowAutoCascade_action  = new TDEToggleAction(i18n("Auto-&cascade"),
266 266
 								  CResMgr::mainMenu::window::arrangementMode::autoCascade::icon,
267 267
 								  CResMgr::mainMenu::window::arrangementMode::autoCascade::accel,
268 268
 								  TQT_TQOBJECT(this), TQT_SLOT(slotAutoCascade()), actionCollection(),
@@ -278,7 +278,7 @@ void BibleTime::initActions() {
278 278
 
279 279
 	m_windowArrangementMode_action->insert( m_windowAutoCascade_action );
280 280
 
281
-	m_windowCascade_action = new KAction(i18n("&Cascade"),
281
+	m_windowCascade_action = new TDEAction(i18n("&Cascade"),
282 282
 										 CResMgr::mainMenu::window::cascade::icon,
283 283
 										 CResMgr::mainMenu::window::cascade::accel,
284 284
 										 TQT_TQOBJECT(this), TQT_SLOT(slotCascade()), actionCollection(),
@@ -292,7 +292,7 @@ void BibleTime::initActions() {
292 292
 	#endif
293 293
 
294 294
 
295
-	m_windowTileVertical_action = new KAction(i18n("Tile &vertically"),
295
+	m_windowTileVertical_action = new TDEAction(i18n("Tile &vertically"),
296 296
 								  CResMgr::mainMenu::window::tileVertical::icon,
297 297
 								  CResMgr::mainMenu::window::tileVertical::accel,
298 298
 								  TQT_TQOBJECT(this), TQT_SLOT(slotTileVertical()), actionCollection(),
@@ -304,7 +304,7 @@ void BibleTime::initActions() {
304 304
 	m_windowTileVertical_action->plugAccel( accel() );
305 305
 	#endif
306 306
 
307
-	m_windowTileHorizontal_action = new KAction(i18n("Tile &horizontally"),
307
+	m_windowTileHorizontal_action = new TDEAction(i18n("Tile &horizontally"),
308 308
 									CResMgr::mainMenu::window::tileHorizontal::icon,
309 309
 									CResMgr::mainMenu::window::tileHorizontal::accel,
310 310
 									TQT_TQOBJECT(this), TQT_SLOT(slotTileHorizontal()), actionCollection(),
@@ -318,7 +318,7 @@ void BibleTime::initActions() {
318 318
 	#endif
319 319
 
320 320
 
321
-	m_windowCloseAll_action = new KAction(i18n("Cl&ose all"),
321
+	m_windowCloseAll_action = new TDEAction(i18n("Cl&ose all"),
322 322
 										  CResMgr::mainMenu::window::closeAll::icon,
323 323
 										  CResMgr::mainMenu::window::closeAll::accel,
324 324
 										  TQT_TQOBJECT(m_mdi), TQT_SLOT(deleteAll()), actionCollection(),
@@ -331,7 +331,7 @@ void BibleTime::initActions() {
331 331
 	#endif
332 332
 
333 333
 
334
-	m_windowSaveProfile_action = new KActionMenu(i18n("&Save session"),
334
+	m_windowSaveProfile_action = new TDEActionMenu(i18n("&Save session"),
335 335
 								 CResMgr::mainMenu::window::saveProfile::icon,
336 336
 								 actionCollection(),
337 337
 								 CResMgr::mainMenu::window::saveProfile::actionName
@@ -344,7 +344,7 @@ void BibleTime::initActions() {
344 344
 	#endif
345 345
 
346 346
 
347
-	m_windowSaveToNewProfile_action = new KAction(i18n("Save as &new session"),
347
+	m_windowSaveToNewProfile_action = new TDEAction(i18n("Save as &new session"),
348 348
 									  CResMgr::mainMenu::window::saveToNewProfile::icon,
349 349
 									  CResMgr::mainMenu::window::saveToNewProfile::accel,
350 350
 									  TQT_TQOBJECT(this), TQT_SLOT(saveToNewProfile()), actionCollection(),
@@ -357,7 +357,7 @@ void BibleTime::initActions() {
357 357
 	#endif
358 358
 
359 359
 
360
-	m_windowLoadProfile_action = new KActionMenu(i18n("&Load session"),
360
+	m_windowLoadProfile_action = new TDEActionMenu(i18n("&Load session"),
361 361
 								 CResMgr::mainMenu::window::loadProfile::icon,
362 362
 								 actionCollection(),
363 363
 								 CResMgr::mainMenu::window::loadProfile::actionName
@@ -369,7 +369,7 @@ void BibleTime::initActions() {
369 369
 	m_windowLoadProfile_action->plugAccel( accel() );
370 370
 	#endif
371 371
 
372
-	m_windowDeleteProfile_action = new KActionMenu(i18n("&Delete session"),
372
+	m_windowDeleteProfile_action = new TDEActionMenu(i18n("&Delete session"),
373 373
 								   CResMgr::mainMenu::window::deleteProfile::icon,
374 374
 								   actionCollection(),
375 375
 								   CResMgr::mainMenu::window::deleteProfile::actionName
@@ -381,7 +381,7 @@ void BibleTime::initActions() {
381 381
 	m_windowDeleteProfile_action->plugAccel( accel() );
382 382
 	#endif
383 383
 
384
-	m_windowFullscreen_action = new KToggleAction(i18n("&Fullscreen mode"),
384
+	m_windowFullscreen_action = new TDEToggleAction(i18n("&Fullscreen mode"),
385 385
 								CResMgr::mainMenu::window::showFullscreen::icon,
386 386
 								CResMgr::mainMenu::window::showFullscreen::accel,
387 387
 								TQT_TQOBJECT(this), TQT_SLOT(toggleFullscreen()), actionCollection(),
@@ -395,9 +395,9 @@ void BibleTime::initActions() {
395 395
 	#endif
396 396
 
397 397
 	//connect the profile popups to the right slots
398
-	KPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
399
-	KPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
400
-	KPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
398
+	TDEPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
399
+	TDEPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
400
+	TDEPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
401 401
 
402 402
 	connect(loadPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(loadProfile(int)));
403 403
 	connect(savePopup, TQT_SIGNAL(activated(int)), TQT_SLOT(saveProfile(int)));
@@ -410,7 +410,7 @@ void BibleTime::initActions() {
410 410
 		(actionCollection()->action(KStdAction::stdName(KStdAction::HelpContents)) );
411 411
 	}
412 412
 
413
-	action = new KAction(i18n("&Handbook"),
413
+	action = new TDEAction(i18n("&Handbook"),
414 414
 						 CResMgr::mainMenu::help::handbook::icon,
415 415
 						 CResMgr::mainMenu::help::handbook::accel,
416 416
 						 TQT_TQOBJECT(this), TQT_SLOT(openOnlineHelp_Handbook()), actionCollection(),
@@ -423,7 +423,7 @@ void BibleTime::initActions() {
423 423
 	action->plugAccel( accel() );
424 424
 	#endif
425 425
 
426
-	action = new KAction(i18n("&Bible Study Howto"),
426
+	action = new TDEAction(i18n("&Bible Study Howto"),
427 427
 						 CResMgr::mainMenu::help::bibleStudyHowTo::icon,
428 428
 						 CResMgr::mainMenu::help::bibleStudyHowTo::accel,
429 429
 						 TQT_TQOBJECT(this), TQT_SLOT(openOnlineHelp_Howto()), actionCollection(),
@@ -437,7 +437,7 @@ void BibleTime::initActions() {
437 437
 	#endif
438 438
 
439 439
 	if ( actionCollection()->action( KStdAction::stdName( KStdAction::WhatsThis ) ) ) {  //delete "What's this" action if KDE created it already
440
-		KAction* action = actionCollection()->action(KStdAction::stdName( KStdAction::WhatsThis ));
440
+		TDEAction* action = actionCollection()->action(KStdAction::stdName( KStdAction::WhatsThis ));
441 441
 		actionCollection()->remove
442 442
 		( action );
443 443
 	}
@@ -454,7 +454,7 @@ void BibleTime::initActions() {
454 454
 	action->plugAccel( accel() );
455 455
 	#endif
456 456
 
457
-	action = new KAction(i18n("&Daily tip"),
457
+	action = new TDEAction(i18n("&Daily tip"),
458 458
 						 CResMgr::mainMenu::help::dailyTip::icon,
459 459
 						 CResMgr::mainMenu::help::dailyTip::accel,
460 460
 						 TQT_TQOBJECT(this), TQT_SLOT(slotHelpTipOfDay()), actionCollection(),
@@ -586,11 +586,11 @@ void BibleTime::applyProfileSettings( CProfile* p ) {
586 586
 		//first Main Window state
587 587
 		m_windowFullscreen_action->setChecked( p->fullscreen() );  //set the fullscreen button state
588 588
 		toggleFullscreen(); //either showFullscreen or showNormal
589
-		if (p->maximized()) KMainWindow::showMaximized(); //if maximized, then also call showMaximized
589
+		if (p->maximized()) TDEMainWindow::showMaximized(); //if maximized, then also call showMaximized
590 590
 	
591 591
 		//Then Main Window geometry
592
-		KMainWindow::resize( p->geometry().size() ); //Don't use KMainWindowInterface::resize
593
-		KMainWindow::move( p->geometry().topLeft() );//Don't use KMainWindowInterface::move
592
+		TDEMainWindow::resize( p->geometry().size() ); //Don't use TDEMainWindowInterface::resize
593
+		TDEMainWindow::move( p->geometry().topLeft() );//Don't use TDEMainWindowInterface::move
594 594
 }
595 595
 }
596 596
 
@@ -600,7 +600,7 @@ void BibleTime::storeProfileSettings( CProfile* p ) {
600 600
 	if (!p || !m_windowFullscreen_action) return;
601 601
 	
602 602
 	p->setFullscreen( m_windowFullscreen_action->isChecked() );
603
-	p->setMaximized( this->KMainWindow::isMaximized() );
603
+	p->setMaximized( this->TDEMainWindow::isMaximized() );
604 604
 
605 605
 	TQRect geometry;
606 606
 	geometry.setTopLeft(pos());

+ 16
- 16
bibletime/bibletime_slots.cpp View File

@@ -66,10 +66,10 @@ using namespace Profile;
66 66
 /* An action which stores a user defined pointer to a widget.
67 67
  * @author Joachim Ansorg
68 68
  */
69
-class KUserDataAction : public KToggleAction {
69
+class KUserDataAction : public TDEToggleAction {
70 70
 public:
71
-	KUserDataAction( TQString caption, const KShortcut& shortcut, const TQObject* receiver, const char* slot, KActionCollection* actionCollection)
72
-: KToggleAction(caption, shortcut, receiver, slot, actionCollection), m_userData(0) { /* no impl */
71
+	KUserDataAction( TQString caption, const TDEShortcut& shortcut, const TQObject* receiver, const char* slot, TDEActionCollection* actionCollection)
72
+: TDEToggleAction(caption, shortcut, receiver, slot, actionCollection), m_userData(0) { /* no impl */
73 73
 	};
74 74
 
75 75
 	void setUserData(TQWidget* const data) {
@@ -171,15 +171,15 @@ void BibleTime::slotWindowMenuAboutToShow() {
171 171
 		m_windowCloseAll_action->setEnabled( true );
172 172
 	}
173 173
 	
174
-	TQPtrList<KAction>::iterator end = m_windowOpenWindowsList.end();
175
-	for (TQPtrList<KAction>::iterator it = m_windowOpenWindowsList.begin(); it != end; ++it ) {
174
+	TQPtrList<TDEAction>::iterator end = m_windowOpenWindowsList.end();
175
+	for (TQPtrList<TDEAction>::iterator it = m_windowOpenWindowsList.begin(); it != end; ++it ) {
176 176
 		(*it)->unplugAll();
177 177
 	}
178 178
 	m_windowOpenWindowsList.setAutoDelete(true);
179 179
 	m_windowOpenWindowsList.clear();
180 180
 
181 181
 	if (!m_windowActionCollection) {
182
-		m_windowActionCollection = new KActionCollection(this);
182
+		m_windowActionCollection = new TDEActionCollection(this);
183 183
 	}
184 184
 
185 185
 	TQWidgetList windows = m_mdi->windowList();
@@ -188,7 +188,7 @@ void BibleTime::slotWindowMenuAboutToShow() {
188 188
 		TQWidget* w = windows.at(i);
189 189
 		Q_ASSERT(w);
190 190
 
191
-		KUserDataAction* action = new KUserDataAction(w->caption(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotWindowMenuActivated()), m_windowActionCollection);
191
+		KUserDataAction* action = new KUserDataAction(w->caption(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotWindowMenuActivated()), m_windowActionCollection);
192 192
 		Q_ASSERT(action);
193 193
 		action->setUserData(w);
194 194
 
@@ -199,7 +199,7 @@ void BibleTime::slotWindowMenuAboutToShow() {
199 199
 }
200 200
 
201 201
 /** This slot is connected with the windowAutoTile_action object */
202
-void BibleTime::slotUpdateWindowArrangementActions( KAction* clickedAction ) {
202
+void BibleTime::slotUpdateWindowArrangementActions( TDEAction* clickedAction ) {
203 203
 	/* If a toggle action was clicked we see if it checked ot unchecked and
204 204
 	* enable/disable the simple cascade and tile options accordingly
205 205
 	*/
@@ -396,7 +396,7 @@ void BibleTime::openOnlineHelp_Howto() {
396 396
 void BibleTime::saveProfile(int ID) {
397 397
 	m_mdi->setUpdatesEnabled(false);
398 398
 
399
-	KPopupMenu* popup = m_windowSaveProfile_action->popupMenu();
399
+	TDEPopupMenu* popup = m_windowSaveProfile_action->popupMenu();
400 400
 	const TQString profileName = popup->text(ID).remove("&");
401 401
 	CProfile* p = m_profileMgr.profile( profileName );
402 402
 	Q_ASSERT(p);
@@ -435,8 +435,8 @@ void BibleTime::saveProfile(CProfile* profile) {
435 435
 }
436 436
 
437 437
 void BibleTime::loadProfile(int ID) {
438
-	KPopupMenu* popup = m_windowLoadProfile_action->popupMenu();
439
-	//HACK: workaround the inserted & char by KPopupMenu
438
+	TDEPopupMenu* popup = m_windowLoadProfile_action->popupMenu();
439
+	//HACK: workaround the inserted & char by TDEPopupMenu
440 440
 	const TQString profileName = popup->text(ID).remove("&");
441 441
 	CProfile* p = m_profileMgr.profile( profileName );
442 442
 	//  tqWarning("requesting popup: %s", popup->text(ID).latin1());
@@ -505,8 +505,8 @@ void BibleTime::loadProfile(CProfile* p) {
505 505
 }
506 506
 
507 507
 void BibleTime::deleteProfile(int ID) {
508
-	KPopupMenu* popup = m_windowDeleteProfile_action->popupMenu();
509
-	//HACK: work around the inserted & char by KPopupMenu
508
+	TDEPopupMenu* popup = m_windowDeleteProfile_action->popupMenu();
509
+	//HACK: work around the inserted & char by TDEPopupMenu
510 510
 	const TQString profileName = popup->text(ID).remove("&");
511 511
 	CProfile* p = m_profileMgr.profile( profileName );
512 512
 	Q_ASSERT(p);
@@ -536,13 +536,13 @@ void BibleTime::saveToNewProfile() {
536 536
 
537 537
 /** Slot to refresh the save profile and load profile menus. */
538 538
 void BibleTime::refreshProfileMenus() {
539
-	KPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
539
+	TDEPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
540 540
 	savePopup->clear();
541 541
 
542
-	KPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
542
+	TDEPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
543 543
 	loadPopup->clear();
544 544
 
545
-	KPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
545
+	TDEPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
546 546
 	deletePopup->clear();
547 547
 
548 548
 	//refresh the load, save and delete profile menus

+ 2
- 2
bibletime/frontend/cbtconfig.cpp View File

@@ -555,7 +555,7 @@ const CSwordBackend::FilterOptions CBTConfig::getFilterOptionDefaults() {
555 555
 	return options;
556 556
 }
557 557
 
558
-void CBTConfig::setupAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection) {
558
+void CBTConfig::setupAccelSettings(const CBTConfig::keys type, TDEActionCollection* const actionCollection) {
559 559
 	TQString groupName;
560 560
 	switch (type) {
561 561
 		case allWindows : {
@@ -596,7 +596,7 @@ void CBTConfig::setupAccelSettings(const CBTConfig::keys type, KActionCollection
596 596
 	actionCollection->readShortcutSettings(groupName, CBTConfig::getConfig());
597 597
 }
598 598
 
599
-void CBTConfig::saveAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection) {
599
+void CBTConfig::saveAccelSettings(const CBTConfig::keys type, TDEActionCollection* const actionCollection) {
600 600
 	TQString groupName;
601 601
 	switch (type) {
602 602
 		case allWindows : {

+ 4
- 4
bibletime/frontend/cbtconfig.h View File

@@ -22,8 +22,8 @@
22 22
 #include <tqmap.h>
23 23
 
24 24
 //Forward declarations
25
-class KAccel;
26
-class KActionCollection;
25
+class TDEAccel;
26
+class TDEActionCollection;
27 27
 class TDEConfig;
28 28
 
29 29
 /**
@@ -162,8 +162,8 @@ public:
162 162
 	static const CSwordBackend::FilterOptions getFilterOptionDefaults();
163 163
 	static const CSwordBackend::DisplayOptions getDisplayOptionDefaults();
164 164
 
165
-	static void setupAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection);
166
-	static void saveAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection);
165
+	static void setupAccelSettings(const CBTConfig::keys type, TDEActionCollection* const actionCollection);
166
+	static void saveAccelSettings(const CBTConfig::keys type, TDEActionCollection* const actionCollection);
167 167
 
168 168
 	static const TQString getModuleEncryptionKey( const TQString& name );
169 169
 	static void setModuleEncryptionKey( const TQString& name, const TQString& key );

+ 1
- 1
bibletime/frontend/cmdiarea.h View File

@@ -22,7 +22,7 @@
22 22
 #include <tqstrlist.h>
23 23
 #include <tqevent.h>
24 24
 
25
-class KPopupMenu;
25
+class TDEPopupMenu;
26 26
 class CSwordModuleInfo;
27 27
 class CSwordKey;
28 28
 

+ 7
- 7
bibletime/frontend/coptionsdialog.cpp View File

@@ -71,7 +71,7 @@
71 71
 using std::string;
72 72
 using std::list;
73 73
 
74
-COptionsDialog::COptionsDialog(TQWidget *parent, const char *name, KActionCollection* actionCollection )
74
+COptionsDialog::COptionsDialog(TQWidget *parent, const char *name, TDEActionCollection* actionCollection )
75 75
 : KDialogBase(IconList, i18n("Configure BibleTime"), Ok | Cancel | Apply, Ok, parent, name, true, true, TQString(), TQString(), TQString()) {
76 76
 
77 77
 	m_settings.keys.application.actionCollection = actionCollection;
@@ -341,7 +341,7 @@ void COptionsDialog::initLanguages() {
341 341
 		layout->addLayout(hLayout);
342 342
 		//#warning TODO: remember the last selected font and jump there.
343 343
 
344
-		m_settings.fonts.fontChooser = new KFontChooser(page, "fonts", false, TQStringList(), true, 5);
344
+		m_settings.fonts.fontChooser = new TDEFontChooser(page, "fonts", false, TQStringList(), true, 5);
345 345
 		m_settings.fonts.fontChooser->setSampleText(i18n("The quick brown fox jumps over the lazy dog."));
346 346
 		layout->addWidget(m_settings.fonts.fontChooser);
347 347
 
@@ -407,7 +407,7 @@ void COptionsDialog::initAccelerators() {
407 407
 			);
408 408
 
409 409
 	// ----- All display windows ------ //
410
-	m_settings.keys.general.actionCollection = new KActionCollection(this, "displayActions", 0);
410
+	m_settings.keys.general.actionCollection = new TDEActionCollection(this, "displayActions", 0);
411 411
 	CDisplayWindow::insertKeyboardActions( m_settings.keys.general.actionCollection);
412 412
 	CBTConfig::setupAccelSettings(
413 413
 		CBTConfig::allWindows,
@@ -419,7 +419,7 @@ void COptionsDialog::initAccelerators() {
419 419
 										 );
420 420
 
421 421
 	// ----- Bible windows ------ //
422
-	m_settings.keys.bible.actionCollection = new KActionCollection(this, "bibleActions", 0);
422
+	m_settings.keys.bible.actionCollection = new TDEActionCollection(this, "bibleActions", 0);
423 423
 	CBibleReadWindow::insertKeyboardActions( m_settings.keys.bible.actionCollection);
424 424
 	CBTConfig::setupAccelSettings(
425 425
 		CBTConfig::bibleWindow,
@@ -427,7 +427,7 @@ void COptionsDialog::initAccelerators() {
427 427
 	);
428 428
 
429 429
 	// ----- Commentary windows ------ //
430
-	m_settings.keys.commentary.actionCollection= new KActionCollection(this, "commentaryActions", 0);
430
+	m_settings.keys.commentary.actionCollection= new TDEActionCollection(this, "commentaryActions", 0);
431 431
 	CCommentaryReadWindow::insertKeyboardActions( m_settings.keys.commentary.actionCollection);
432 432
 	CBTConfig::setupAccelSettings(
433 433
 		CBTConfig::commentaryWindow,
@@ -435,7 +435,7 @@ void COptionsDialog::initAccelerators() {
435 435
 	);
436 436
 
437 437
 	// ----- Lexicon windows ------ //
438
-	m_settings.keys.lexicon.actionCollection = new KActionCollection(this, "lexiconActions", 0);
438
+	m_settings.keys.lexicon.actionCollection = new TDEActionCollection(this, "lexiconActions", 0);
439 439
 	CLexiconReadWindow::insertKeyboardActions(  m_settings.keys.lexicon.actionCollection );
440 440
 	CBTConfig::setupAccelSettings(
441 441
 		CBTConfig::lexiconWindow,
@@ -443,7 +443,7 @@ void COptionsDialog::initAccelerators() {
443 443
 	);
444 444
 
445 445
 	// ----- Book windows ------ //
446
-	m_settings.keys.book.actionCollection= new KActionCollection(this, "bookActions", 0);
446
+	m_settings.keys.book.actionCollection= new TDEActionCollection(this, "bookActions", 0);
447 447
 	CBookReadWindow::insertKeyboardActions( m_settings.keys.book.actionCollection);
448 448
 	CBTConfig::setupAccelSettings(
449 449
 		CBTConfig::bookWindow,

+ 5
- 5
bibletime/frontend/coptionsdialog.h View File

@@ -40,11 +40,11 @@ class TQComboBox;
40 40
 class TQRadioButton;
41 41
 class TQWidgetStack;
42 42
 
43
-class KListBox;
43
+class TDEListBox;
44 44
 class KKeyChooser;
45 45
 class KTabCtl;
46 46
 class TDEHTMLPart;
47
-class KActionCollection;
47
+class TDEActionCollection;
48 48
 
49 49
 /**
50 50
  * The optionsdialog of BibleTime
@@ -55,7 +55,7 @@ class COptionsDialog : public KDialogBase, public CPointers  {
55 55
   
56 56
 
57 57
 public:
58
-	COptionsDialog(TQWidget *parent, const char *name, KActionCollection* actionCollection);
58
+	COptionsDialog(TQWidget *parent, const char *name, TDEActionCollection* actionCollection);
59 59
 	virtual ~COptionsDialog();
60 60
 
61 61
 	enum Parts {
@@ -104,7 +104,7 @@ private:
104 104
 
105 105
 			struct WindowType {
106 106
 				TQGuardedPtr<KKeyChooser> keyChooser;
107
-				KActionCollection* actionCollection;
107
+				TDEActionCollection* actionCollection;
108 108
 				TQString title;
109 109
 
110 110
 				WindowType() {
@@ -136,7 +136,7 @@ private:
136 136
 
137 137
 		struct FontSettings {
138 138
 			TQComboBox* swordLocaleCombo;
139
-			KFontChooser* fontChooser;
139
+			TDEFontChooser* fontChooser;
140 140
 			TQComboBox* usage;
141 141
 			TQCheckBox* useOwnFontBox;
142 142
 			//the pair os to check whether the standard font (bool == false) or whether an own font should be used (true)

+ 1
- 1
bibletime/frontend/cswordsetupmodulelistview.cpp View File

@@ -66,7 +66,7 @@ namespace BookshelfManager {
66 66
      * @author Martin Gruner
67 67
      */
68 68
     CSwordSetupModuleListView::CSwordSetupModuleListView(TQWidget *parent, bool is_remote, sword::InstallSource* installSource)
69
-            : KListView(parent), m_is_remote( is_remote ) {
69
+            : TDEListView(parent), m_is_remote( is_remote ) {
70 70
         Q_ASSERT(installSource);
71 71
         new BookshelfManager::ToolTip(this);
72 72
         m_backend = installSource ? BTInstallMgr::Tool::backend(installSource) : CPointers::backend();

+ 1
- 1
bibletime/frontend/cswordsetupmodulelistview.h View File

@@ -27,7 +27,7 @@ class CSwordBackend;
27 27
 
28 28
 namespace BookshelfManager {
29 29
 
30
-class CSwordSetupModuleListView : public KListView {
30
+class CSwordSetupModuleListView : public TDEListView {
31 31
 	Q_OBJECT
32 32
   
33 33
 

+ 14
- 14
bibletime/frontend/display/chtmlwritedisplay.cpp View File

@@ -129,8 +129,8 @@ void CHTMLWriteDisplay::slotFontChanged( const TQFont& font ) {
129 129
 	m_actions.underline->setChecked( font.underline() );
130 130
 };
131 131
 
132
-void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions) {
133
-	m_actions.fontChooser = new KFontAction( i18n("Choose a font"),
132
+void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * actions) {
133
+	m_actions.fontChooser = new TDEFontAction( i18n("Choose a font"),
134 134
 							CResMgr::displaywindows::writeWindow::underlinedText::accel,
135 135
 							actions,
136 136
 							CResMgr::displaywindows::writeWindow::fontFamily::actionName
@@ -141,7 +141,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
141 141
 	connect(m_actions.fontChooser, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(setFamily(const TQString&)));
142 142
 
143 143
 
144
-	m_actions.fontSizeChooser = new KFontSizeAction( i18n("Choose a font size"),
144
+	m_actions.fontSizeChooser = new TDEFontSizeAction( i18n("Choose a font size"),
145 145
 								CResMgr::displaywindows::writeWindow::fontSize::accel,
146 146
 								actions,
147 147
 								CResMgr::displaywindows::writeWindow::fontSize::actionName
@@ -159,9 +159,9 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
159 159
 
160 160
 
161 161
 
162
-	(new KActionSeparator())->plug(bar); //seperate font options from formatting buttons
162
+	(new TDEActionSeparator())->plug(bar); //seperate font options from formatting buttons
163 163
 
164
-	m_actions.bold = new KToggleAction( i18n("Bold"),
164
+	m_actions.bold = new TDEToggleAction( i18n("Bold"),
165 165
 										CResMgr::displaywindows::writeWindow::boldText::icon,
166 166
 										CResMgr::displaywindows::writeWindow::boldText::accel,
167 167
 										TQT_TQOBJECT(this), TQT_SLOT(toggleBold()),
@@ -172,7 +172,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
172 172
 
173 173
 	m_actions.bold->plug(bar);
174 174
 
175
-	m_actions.italic = new KToggleAction( i18n("Italic"),
175
+	m_actions.italic = new TDEToggleAction( i18n("Italic"),
176 176
 										  CResMgr::displaywindows::writeWindow::italicText::icon,
177 177
 										  CResMgr::displaywindows::writeWindow::italicText::accel,
178 178
 										  TQT_TQOBJECT(this), TQT_SLOT(toggleItalic()),
@@ -183,7 +183,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
183 183
 
184 184
 	m_actions.italic->plug(bar);
185 185
 
186
-	m_actions.underline = new KToggleAction( i18n("Underline"),
186
+	m_actions.underline = new TDEToggleAction( i18n("Underline"),
187 187
 						  CResMgr::displaywindows::writeWindow::underlinedText::icon,
188 188
 						  CResMgr::displaywindows::writeWindow::underlinedText::accel,
189 189
 						  TQT_TQOBJECT(this), TQT_SLOT(toggleUnderline()),
@@ -195,9 +195,9 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
195 195
 	m_actions.underline->plug(bar);
196 196
 
197 197
 
198
-	(new KActionSeparator())->plug(bar); //seperate formatting from alignment buttons
198
+	(new TDEActionSeparator())->plug(bar); //seperate formatting from alignment buttons
199 199
 
200
-	m_actions.alignLeft = new KToggleAction( i18n("Left"),
200
+	m_actions.alignLeft = new TDEToggleAction( i18n("Left"),
201 201
 						  CResMgr::displaywindows::writeWindow::alignLeft::icon,
202 202
 						  CResMgr::displaywindows::writeWindow::alignLeft::accel,
203 203
 						  TQT_TQOBJECT(this), TQT_SLOT( alignLeft()  ),
@@ -208,7 +208,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
208 208
 
209 209
 	m_actions.alignLeft->plug(bar);
210 210
 
211
-	m_actions.alignCenter = new KToggleAction( i18n("Center"),
211
+	m_actions.alignCenter = new TDEToggleAction( i18n("Center"),
212 212
 							CResMgr::displaywindows::writeWindow::alignCenter::icon,
213 213
 							CResMgr::displaywindows::writeWindow::alignCenter::accel,
214 214
 							TQT_TQOBJECT(this), TQT_SLOT(alignCenter()),
@@ -219,7 +219,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
219 219
 
220 220
 	m_actions.alignCenter->plug(bar);
221 221
 
222
-	m_actions.alignRight = new KToggleAction( i18n("Right"),
222
+	m_actions.alignRight = new TDEToggleAction( i18n("Right"),
223 223
 						   CResMgr::displaywindows::writeWindow::alignRight::icon,
224 224
 						   CResMgr::displaywindows::writeWindow::alignRight::accel,
225 225
 						   TQT_TQOBJECT(this), TQT_SLOT(alignRight()),
@@ -230,7 +230,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
230 230
 
231 231
 	m_actions.alignRight->plug(bar);
232 232
 
233
-	//  m_actions.alignJustify = new KToggleAction( i18n("Justify"),
233
+	//  m_actions.alignJustify = new TDEToggleAction( i18n("Justify"),
234 234
 	//    CResMgr::displaywindows::writeWindow::alignJustify::icon,
235 235
 	//    CResMgr::displaywindows::writeWindow::alignJustify::accel,
236 236
 	//    this, TQT_SLOT( alignJustify()  ),
@@ -255,10 +255,10 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
255 255
 /** Reimplementation to show a popup menu if the right mouse butoon was clicked. */
256 256
 TQPopupMenu* CHTMLWriteDisplay::createPopupMenu( const TQPoint& /*pos*/ ) {
257 257
 	if (!m_actions.selectAll) {
258
-		m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(selectAll()), TQT_TQOBJECT(this));
258
+		m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(selectAll()), TQT_TQOBJECT(this));
259 259
 	}
260 260
 
261
-	KPopupMenu* popup = new KPopupMenu(this);
261
+	TDEPopupMenu* popup = new TDEPopupMenu(this);
262 262
 	popup->insertTitle(i18n("HTML editor window"));
263 263
 	m_actions.selectAll->plug(popup);
264 264
 

+ 13
- 13
bibletime/frontend/display/chtmlwritedisplay.h View File

@@ -23,9 +23,9 @@ class CWriteWindow;
23 23
 
24 24
 class TQPopupMenu;
25 25
 
26
-class KToggleAction;
27
-class KFontAction;
28
-class KFontSizeAction;
26
+class TDEToggleAction;
27
+class TDEFontAction;
28
+class TDEFontSizeAction;
29 29
 
30 30
 class KColorButton;
31 31
 
@@ -48,7 +48,7 @@ public:
48 48
 	/**
49 49
 	* Creates the necessary action objects and puts them on the toolbar.
50 50
 	*/
51
-	virtual void setupToolbar(KToolBar * bar, KActionCollection * actionCollection);
51
+	virtual void setupToolbar(TDEToolBar * bar, TDEActionCollection * actionCollection);
52 52
 
53 53
 protected:
54 54
 	friend class CDisplay;
@@ -84,19 +84,19 @@ protected slots:
84 84
 
85 85
 private:
86 86
 	struct {
87
-		KToggleAction* bold;
88
-		KToggleAction* italic;
89
-		KToggleAction* underline;
87
+		TDEToggleAction* bold;
88
+		TDEToggleAction* italic;
89
+		TDEToggleAction* underline;
90 90
 
91
-		KToggleAction* alignLeft;
92
-		KToggleAction* alignCenter;
93
-		KToggleAction* alignRight;
91
+		TDEToggleAction* alignLeft;
92
+		TDEToggleAction* alignCenter;
93
+		TDEToggleAction* alignRight;
94 94
 
95
-		KFontAction* fontChooser;
96
-		KFontSizeAction* fontSizeChooser;
95
+		TDEFontAction* fontChooser;
96
+		TDEFontSizeAction* fontSizeChooser;
97 97
 
98 98
 		//popup menu
99
-		KAction* selectAll;
99
+		TDEAction* selectAll;
100 100
 	}
101 101
 	m_actions;
102 102
 	KColorButton* m_colorButton;

+ 1
- 1
bibletime/frontend/display/cplainwritedisplay.cpp View File

@@ -96,7 +96,7 @@ TQPopupMenu* CPlainWriteDisplay::createPopupMenu( ) {
96 96
 }
97 97
 
98 98
 /** Creates the necessary action objects and puts them on the toolbar. */
99
-void CPlainWriteDisplay::setupToolbar(KToolBar* /*bar*/, KActionCollection* /*actionCollection*/) {}
99
+void CPlainWriteDisplay::setupToolbar(TDEToolBar* /*bar*/, TDEActionCollection* /*actionCollection*/) {}
100 100
 
101 101
 /** Reimplementation to insert the text of a dragged reference into the edit view. */
102 102
 void CPlainWriteDisplay::contentsDragEnterEvent( TQDragEnterEvent* e ) {

+ 2
- 2
bibletime/frontend/display/cplainwritedisplay.h View File

@@ -20,7 +20,7 @@
20 20
 #include <tqtextedit.h>
21 21
 
22 22
 class CHTMLWriteDisplay;
23
-class KAction;
23
+class TDEAction;
24 24
 
25 25
 /** The write display implementation for plain source code editing.
26 26
   * @author The BibleTime team
@@ -60,7 +60,7 @@ public:
60 60
 	/**
61 61
 	* Creates the necessary action objects and puts them on the toolbar.
62 62
 	*/
63
-	virtual void setupToolbar(KToolBar * bar, KActionCollection * actionCollection);
63
+	virtual void setupToolbar(TDEToolBar * bar, TDEActionCollection * actionCollection);
64 64
 
65 65
 protected:
66 66
 	friend class CDisplay;

+ 3
- 3
bibletime/frontend/display/cwritedisplay.h View File

@@ -14,8 +14,8 @@
14 14
 
15 15
 #include "cdisplay.h"
16 16
 
17
-class KActionCollection;
18
-class KToolBar;
17
+class TDEActionCollection;
18
+class TDEToolBar;
19 19
 
20 20
 /**The base class for all read/write-display classes.
21 21
   *@author The BibleTime team
@@ -44,7 +44,7 @@ public: // Public methods
44 44
 	/**
45 45
 	* Creates the necessary action objects and puts them on the toolbar.
46 46
 	*/
47
-	virtual void setupToolbar( KToolBar* bar, KActionCollection* actionCollection ) = 0;
47
+	virtual void setupToolbar( TDEToolBar* bar, TDEActionCollection* actionCollection ) = 0;
48 48
 };
49 49
 
50 50
 #endif

+ 39
- 39
bibletime/frontend/displaywindow/cbiblereadwindow.cpp View File

@@ -77,50 +77,50 @@ void CBibleReadWindow::storeProfileSettings( CProfileWindow* const settings ) {
77 77
 
78 78
 
79 79
 /** Reimplementation. */
80
-void CBibleReadWindow::insertKeyboardActions( KActionCollection* const a ) {
81
-	new KAction(
80
+void CBibleReadWindow::insertKeyboardActions( TDEActionCollection* const a ) {
81
+	new TDEAction(
82 82
 		i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel,
83 83
 		a, "nextBook"
84 84
 	);
85
-	new KAction(
85
+	new TDEAction(
86 86
 		i18n("Previous book"), CResMgr::displaywindows::bibleWindow::previousBook::accel,
87 87
 		a, "previousBook"
88 88
 	);
89
-	new KAction(
89
+	new TDEAction(
90 90
 		i18n("Next chapter"), CResMgr::displaywindows::bibleWindow::nextChapter::accel,
91 91
 		a, "nextChapter"
92 92
 	);
93
-	new KAction(
93
+	new TDEAction(
94 94
 		i18n("Previous chapter"), CResMgr::displaywindows::bibleWindow::previousChapter::accel,
95 95
 		a, "previousChapter"
96 96
 	);
97
-	new KAction(
97
+	new TDEAction(
98 98
 		i18n("Next verse"), CResMgr::displaywindows::bibleWindow::nextVerse::accel,
99 99
 		a, "nextVerse"
100 100
 	);
101
-	new KAction(
101
+	new TDEAction(
102 102
 		i18n("Previous verse"), CResMgr::displaywindows::bibleWindow::previousVerse::accel,
103 103
 		a, "previousVerse"
104 104
 	);
105 105
 
106 106
 	//popup menu items
107
-	//  new KAction(i18n("Select all"), KStdAccel::selectAll(), a, "selectAll");
107
+	//  new TDEAction(i18n("Select all"), TDEStdAccel::selectAll(), a, "selectAll");
108 108
 
109 109
 	//copy menu items
110
-	//  new KAction(i18n("Copy reference only"), KShortcut(0), a, "copyReferenceOnly");
111
-	//  new KAction(i18n("Text of reference"), KShortcut(0), a, "copyTextOfReference");
112
-	//   new KAction(i18n("Reference with text"), KShortcut(0), a, "copyReferenceWithText");
113
-	new KAction(i18n("Copy chapter"), KShortcut(0), a, "copyChapter");
114
-	//   new KAction(i18n("Copy selected text"), KStdAccel::copy(), a, "copySelectedText");
110
+	//  new TDEAction(i18n("Copy reference only"), TDEShortcut(0), a, "copyReferenceOnly");
111
+	//  new TDEAction(i18n("Text of reference"), TDEShortcut(0), a, "copyTextOfReference");
112
+	//   new TDEAction(i18n("Reference with text"), TDEShortcut(0), a, "copyReferenceWithText");
113
+	new TDEAction(i18n("Copy chapter"), TDEShortcut(0), a, "copyChapter");
114
+	//   new TDEAction(i18n("Copy selected text"), TDEStdAccel::copy(), a, "copySelectedText");
115 115
 
116 116
 	//save menu
117
-	//   new KAction(i18n("Reference with text"), KShortcut(0), a, "saveReferenceWithText");
118
-	new KAction(i18n("Save chapter as plain text"), KShortcut(0), a, "saveChapterAsPlainText");
119
-	new KAction(i18n("Save chapter as HTML"), KShortcut(0), a, "saveChapterAsHTML");
120
-	//   new KAction(i18n("Reference with text"), KShortcut(0), a, "saveReferenceWithText");
117
+	//   new TDEAction(i18n("Reference with text"), TDEShortcut(0), a, "saveReferenceWithText");
118
+	new TDEAction(i18n("Save chapter as plain text"), TDEShortcut(0), a, "saveChapterAsPlainText");
119
+	new TDEAction(i18n("Save chapter as HTML"), TDEShortcut(0), a, "saveChapterAsHTML");
120
+	//   new TDEAction(i18n("Reference with text"), TDEShortcut(0), a, "saveReferenceWithText");
121 121
 
122 122
 	//print
123
-	new KAction(i18n("Print chapter"), KStdAccel::print(), a, "printChapter");
123
+	new TDEAction(i18n("Print chapter"), TDEStdAccel::print(), a, "printChapter");
124 124
 }
125 125
 
126 126
 void CBibleReadWindow::initActions() {
@@ -130,37 +130,37 @@ void CBibleReadWindow::initActions() {
130 130
 	actionCollection()->action("nextEntry")->setEnabled(false);
131 131
 	actionCollection()->action("previousEntry")->setEnabled(false);
132 132
 
133
-	new KAction(
133
+	new TDEAction(
134 134
 		i18n("Next book"),
135 135
 		CResMgr::displaywindows::bibleWindow::nextBook::accel,
136 136
 		TQT_TQOBJECT(this), TQT_SLOT(nextBook()),
137 137
 		actionCollection(), "nextBook"
138 138
 	);
139
-	new KAction(
139
+	new TDEAction(
140 140
 		i18n("Previous book"),
141 141
 		CResMgr::displaywindows::bibleWindow::previousBook::accel,
142 142
 		TQT_TQOBJECT(this), TQT_SLOT(previousBook()),
143 143
 		actionCollection(), "previousBook"
144 144
 	);
145
-	new KAction(
145
+	new TDEAction(
146 146
 		i18n("Next chapter"),
147 147
 		CResMgr::displaywindows::bibleWindow::nextChapter::accel,
148 148
 		TQT_TQOBJECT(this), TQT_SLOT(nextChapter()),
149 149
 		actionCollection(), "nextChapter"
150 150
 	);
151
-	new KAction(
151
+	new TDEAction(
152 152
 		i18n("Previous chapter"),
153 153
 		CResMgr::displaywindows::bibleWindow::previousChapter::accel,
154 154
 		TQT_TQOBJECT(this), TQT_SLOT(previousChapter()),
155 155
 		actionCollection(), "previousChapter"
156 156
 	);
157
-	new KAction(
157
+	new TDEAction(
158 158
 		i18n("Next verse"),
159 159
 		CResMgr::displaywindows::bibleWindow::nextVerse::accel,
160 160
 		TQT_TQOBJECT(this), TQT_SLOT(nextVerse()),
161 161
 		actionCollection(), "nextVerse"
162 162
 	);
163
-	new KAction(
163
+	new TDEAction(
164 164
 		i18n("Previous verse"),
165 165
 		CResMgr::displaywindows::bibleWindow::previousVerse::accel,
166 166
 		TQT_TQOBJECT(this), TQT_SLOT(previousVerse()),
@@ -173,7 +173,7 @@ void CBibleReadWindow::initActions() {
173 173
 	m_actions.findText = actionCollection()->action("findText");
174 174
 	Q_ASSERT(m_actions.findText);
175 175
 
176
-	m_actions.findStrongs = new KAction(
176
+	m_actions.findStrongs = new TDEAction(
177 177
 		i18n("Strong's Search"),
178 178
 		CResMgr::displaywindows::general::findStrongs::icon,
179 179
 		CResMgr::displaywindows::general::findStrongs::accel,
@@ -182,26 +182,26 @@ void CBibleReadWindow::initActions() {
182 182
 		CResMgr::displaywindows::general::findStrongs::actionName);
183 183
 
184 184
 
185
-	m_actions.copy.referenceOnly = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
185
+	m_actions.copy.referenceOnly = new TDEAction(i18n("Reference only"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
186 186
 
187
-	m_actions.copy.referenceTextOnly = new KAction(i18n("Text of reference"), KShortcut(0),displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference");
187
+	m_actions.copy.referenceTextOnly = new TDEAction(i18n("Text of reference"), TDEShortcut(0),displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference");
188 188
 
189
-	m_actions.copy.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText");
189
+	m_actions.copy.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText");
190 190
 
191
-	m_actions.copy.chapter = new KAction(i18n("Chapter"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyDisplayedText()), actionCollection(), "copyChapter");
191
+	m_actions.copy.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyDisplayedText()), actionCollection(), "copyChapter");
192 192
 
193 193
 	m_actions.copy.selectedText = actionCollection()->action("copySelectedText");
194 194
 	Q_ASSERT(m_actions.copy.selectedText);
195 195
 
196
-	m_actions.save.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText");
196
+	m_actions.save.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText");
197 197
 
198
-	m_actions.save.chapterAsPlain = new KAction(i18n("Chapter as plain text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText");
198
+	m_actions.save.chapterAsPlain = new TDEAction(i18n("Chapter as plain text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText");
199 199
 
200
-	m_actions.save.chapterAsHTML = new KAction(i18n("Chapter as HTML"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML");
200
+	m_actions.save.chapterAsHTML = new TDEAction(i18n("Chapter as HTML"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML");
201 201
 
202
-	m_actions.print.reference = new KAction(i18n("Reference with text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText");
202
+	m_actions.print.reference = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText");
203 203
 
204
-	m_actions.print.chapter = new KAction(i18n("Chapter"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printChapter");
204
+	m_actions.print.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printChapter");
205 205
 
206 206
 	CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, actionCollection());
207 207
 }
@@ -232,26 +232,26 @@ void CBibleReadWindow::setupPopupMenu() {
232 232
 	m_actions.findStrongs->plug(popup());
233 233
 	m_actions.selectAll->plug(popup());
234 234
 		
235
-	(new KActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
235
+	(new TDEActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
236 236
 
237
-	m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::bibleWindow::copyMenu::icon, TQT_TQOBJECT(popup()));
237
+	m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::displaywindows::bibleWindow::copyMenu::icon, TQT_TQOBJECT(popup()));
238 238
 	m_actions.copyMenu->setDelayed( false );
239 239
 	m_actions.copyMenu->insert(m_actions.copy.referenceOnly);
240 240
 	m_actions.copyMenu->insert(m_actions.copy.referenceTextOnly);
241 241
 	m_actions.copyMenu->insert(m_actions.copy.referenceAndText);
242 242
 	m_actions.copyMenu->insert(m_actions.copy.chapter);
243
-	m_actions.copyMenu->insert(new KActionSeparator(TQT_TQOBJECT(this)));
243
+	m_actions.copyMenu->insert(new TDEActionSeparator(TQT_TQOBJECT(this)));
244 244
 	m_actions.copyMenu->insert(m_actions.copy.selectedText);
245 245
 	m_actions.copyMenu->plug(popup());
246 246
 
247
-	m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::displaywindows::bibleWindow::saveMenu::icon,TQT_TQOBJECT(popup()));
247
+	m_actions.saveMenu = new TDEActionMenu(i18n("Save..."),CResMgr::displaywindows::bibleWindow::saveMenu::icon,TQT_TQOBJECT(popup()));
248 248
 	m_actions.saveMenu->setDelayed( false );
249 249
 	m_actions.saveMenu->insert(m_actions.save.referenceAndText);
250 250
 	m_actions.saveMenu->insert(m_actions.save.chapterAsPlain);
251 251
 	m_actions.saveMenu->insert(m_actions.save.chapterAsHTML);
252 252
 	m_actions.saveMenu->plug(popup());
253 253
 
254
-	m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::displaywindows::bibleWindow::printMenu::icon, TQT_TQOBJECT(popup()));
254
+	m_actions.printMenu = new TDEActionMenu(i18n("Print..."),CResMgr::displaywindows::bibleWindow::printMenu::icon, TQT_TQOBJECT(popup()));
255 255
 	m_actions.printMenu->setDelayed(false);
256 256
 	m_actions.printMenu->insert(m_actions.print.reference);
257 257
 	m_actions.printMenu->insert(m_actions.print.chapter);

+ 17
- 17
bibletime/frontend/displaywindow/cbiblereadwindow.h View File

@@ -48,7 +48,7 @@ public:
48 48
 	/**
49 49
 	* Reimplementation.
50 50
 	*/
51
-	static void insertKeyboardActions( KActionCollection* const a );
51
+	static void insertKeyboardActions( TDEActionCollection* const a );
52 52
 
53 53
 protected:
54 54
 	virtual void initActions();
@@ -69,32 +69,32 @@ protected:
69 69
 	virtual bool eventFilter( TQObject* o, TQEvent* e);
70 70
 
71 71
 	struct {
72
-		KAction* selectAll;
73
-		KAction* findText;
74
-		KAction* findStrongs;
72
+		TDEAction* selectAll;
73
+		TDEAction* findText;
74
+		TDEAction* findStrongs;
75 75
 
76
-		KActionMenu* copyMenu;
76
+		TDEActionMenu* copyMenu;
77 77
 		struct {
78
-			KAction* referenceOnly;
79
-			KAction* referenceTextOnly;
80
-			KAction* referenceAndText;
81
-			KAction* chapter;
82
-			KAction* selectedText;
78
+			TDEAction* referenceOnly;
79
+			TDEAction* referenceTextOnly;
80
+			TDEAction* referenceAndText;
81
+			TDEAction* chapter;
82
+			TDEAction* selectedText;
83 83
 		}
84 84
 		copy;
85 85
 
86
-		KActionMenu* saveMenu;
86
+		TDEActionMenu* saveMenu;
87 87
 		struct {
88
-			KAction* referenceAndText;
89
-			KAction* chapterAsPlain;
90
-			KAction* chapterAsHTML;
88
+			TDEAction* referenceAndText;
89
+			TDEAction* chapterAsPlain;
90
+			TDEAction* chapterAsHTML;
91 91
 		}
92 92
 		save;
93 93
 
94
-		KActionMenu* printMenu;
94
+		TDEActionMenu* printMenu;
95 95
 		struct {
96
-			KAction* reference;
97
-			KAction* chapter;
96
+			TDEAction* reference;
97
+			TDEAction* chapter;
98 98
 		}
99 99
 		print;
100 100
 	}

+ 13
- 13
bibletime/frontend/displaywindow/cbookreadwindow.cpp View File

@@ -61,7 +61,7 @@ void CBookReadWindow::initActions() {
61 61
 	actionCollection()->action("nextEntry")->setEnabled(false);
62 62
 	actionCollection()->action("previousEntry")->setEnabled(false);
63 63
 
64
-	m_treeAction = new KToggleAction(
64
+	m_treeAction = new TDEToggleAction(
65 65
 					   i18n("Toggle tree view"),
66 66
 					   CResMgr::displaywindows::bookWindow::toggleTree::icon,
67 67
 					   CResMgr::displaywindows::bookWindow::toggleTree::accel,
@@ -71,20 +71,20 @@ void CBookReadWindow::initActions() {
71 71
 	CBTConfig::setupAccelSettings(CBTConfig::bookWindow, actionCollection());
72 72
 };
73 73
 
74
-void CBookReadWindow::insertKeyboardActions( KActionCollection* const a ) {
75
-	new KToggleAction(
74
+void CBookReadWindow::insertKeyboardActions( TDEActionCollection* const a ) {
75
+	new TDEToggleAction(
76 76
 		i18n("Toggle tree view"),
77 77
 		CResMgr::displaywindows::bookWindow::toggleTree::icon,
78 78
 		CResMgr::displaywindows::bookWindow::toggleTree::accel,
79 79
 		a, "toggleTree");
80 80
 		
81
-		//  new KAction(i18n("Copy reference only"), KShortcut(0), a, "copyReferenceOnly");
82
-	new KAction(i18n("Copy entry with text"), KShortcut(0), a, "copyEntryWithText");
83
-	//  new KAction(i18n("Copy selected text"), KShortcut(0), a, "copySelectedText");
84
-	new KAction(i18n("Save entry as plain text"), KShortcut(0), a, "saveEntryAsPlainText");
85
-	new KAction(i18n("Save entry as HTML"), KShortcut(0), a, "saveEntryAsHTML");
86
-	//   new KAction(i18n("Print reference only"), KShortcut(0), a, "printReferenceOnly");
87
-	new KAction(i18n("Print entry with text"), KShortcut(0), a, "printEntryWithText");
81
+		//  new TDEAction(i18n("Copy reference only"), TDEShortcut(0), a, "copyReferenceOnly");
82
+	new TDEAction(i18n("Copy entry with text"), TDEShortcut(0), a, "copyEntryWithText");
83
+	//  new TDEAction(i18n("Copy selected text"), TDEShortcut(0), a, "copySelectedText");
84
+	new TDEAction(i18n("Save entry as plain text"), TDEShortcut(0), a, "saveEntryAsPlainText");
85
+	new TDEAction(i18n("Save entry as HTML"), TDEShortcut(0), a, "saveEntryAsHTML");
86
+	//   new TDEAction(i18n("Print reference only"), TDEShortcut(0), a, "printReferenceOnly");
87
+	new TDEAction(i18n("Print entry with text"), TDEShortcut(0), a, "printEntryWithText");
88 88
 
89 89
 }
90 90
 
@@ -104,7 +104,7 @@ void CBookReadWindow::initConnections() {
104 104
 void CBookReadWindow::initView() {
105 105
 	TQSplitter* splitter = new TQSplitter(this);
106 106
 
107
-	setMainToolBar( new KToolBar(this) );
107
+	setMainToolBar( new TDEToolBar(this) );
108 108
 	addDockWindow(mainToolBar());
109 109
 
110 110
 	m_treeChooser = new CBookTreeChooser(modules(), key(), splitter);
@@ -116,7 +116,7 @@ void CBookReadWindow::initView() {
116 116
 	moduleChooserBar()->setButtonLimit(1);
117 117
 	addDockWindow( moduleChooserBar() );
118 118
 
119
-	setButtonsToolBar( new KToolBar(this) );
119
+	setButtonsToolBar( new TDEToolBar(this) );
120 120
 	addDockWindow( buttonsToolBar() );
121 121
 	setDisplaySettingsButton( new CDisplaySettingsButton( &displayOptions(), &filterOptions(), modules(), buttonsToolBar()) );
122 122
 
@@ -141,7 +141,7 @@ void CBookReadWindow::initToolbars() {
141 141
 
142 142
 	buttonsToolBar()->insertWidget(2,displaySettingsButton()->size().width(),displaySettingsButton());
143 143
 
144
-	KAction* action = actionCollection()->action(
144
+	TDEAction* action = actionCollection()->action(
145 145
 						  CResMgr::displaywindows::general::search::actionName );
146 146
 	if (action) {
147 147
 		action->plug(buttonsToolBar());

+ 3
- 3
bibletime/frontend/displaywindow/cbookreadwindow.h View File

@@ -18,7 +18,7 @@
18 18
 #include "backend/cswordtreekey.h"
19 19
 #include "backend/cswordversekey.h"
20 20
 
21
-class KToggleAction;
21
+class TDEToggleAction;
22 22
 class CBookTreeChooser;
23 23
 
24 24
 /**
@@ -28,7 +28,7 @@ class CBookReadWindow : public CLexiconReadWindow  {
28 28
 	Q_OBJECT
29 29
   
30 30
 public:
31
-	static void insertKeyboardActions( KActionCollection* const a );
31
+	static void insertKeyboardActions( TDEActionCollection* const a );
32 32
 
33 33
 	CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
34 34
 	
@@ -57,7 +57,7 @@ protected:
57 57
 	virtual void modulesChanged();
58 58
 
59 59
 private:
60
-	KToggleAction* m_treeAction;
60
+	TDEToggleAction* m_treeAction;
61 61
 	CBookTreeChooser* m_treeChooser;
62 62
 
63 63
 private slots: // Private slots

+ 4
- 4
bibletime/frontend/displaywindow/cbuttons.cpp View File

@@ -26,11 +26,11 @@
26 26
 
27 27
 
28 28
 // CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, TQWidget *parent, const char *name )
29
-//  : KToolBarButton(CResMgr::displaywindows::transliteration::icon, 0,parent,name) {
29
+//  : TDEToolBarButton(CResMgr::displaywindows::transliteration::icon, 0,parent,name) {
30 30
 //   m_filterOptions = filterOptions;
31 31
 //   m_filterOptions->transliteration = 0;
32 32
 //
33
-//   m_popup = new KPopupMenu(this);
33
+//   m_popup = new TDEPopupMenu(this);
34 34
 //  setPopup(m_popup);
35 35
 //  setPopupDelay(0001);
36 36
 //
@@ -87,13 +87,13 @@
87 87
  ************************************************/
88 88
 
89 89
 CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const ListCSwordModuleInfo& useModules,TQWidget *parent, const char *name )
90
-: KToolBarButton(CResMgr::displaywindows::displaySettings::icon, 0, parent, name) {
90
+: TDEToolBarButton(CResMgr::displaywindows::displaySettings::icon, 0, parent, name) {
91 91
 	//  tqWarning("CDisplaySettingsButton::CDisplaySettingsButton");
92 92
 	m_displaySettings = displaySettings;
93 93
 	m_moduleSettings = moduleSettings;
94 94
 	m_modules = useModules;
95 95
 
96
-	m_popup = new KPopupMenu(this);
96
+	m_popup = new TDEPopupMenu(this);
97 97
 	setPopup(m_popup);
98 98
 	setPopupDelay(0001); //Fix, O only opens menu on mouse release or move
99 99
 

+ 5
- 5
bibletime/frontend/displaywindow/cbuttons.h View File

@@ -22,12 +22,12 @@
22 22
 //KDE includes
23 23
 #include <ktoolbarbutton.h>
24 24
 
25
-class KPopupMenu;
25
+class TDEPopupMenu;
26 26
 
27 27
 /** This class manages the transliteration of the selected modules.
28 28
   * @author The BibleTime team
29 29
   */
30
-// class CTransliterationButton : public KToolBarButton  {
30
+// class CTransliterationButton : public TDEToolBarButton  {
31 31
 //    Q_OBJECT
32 32
 //    
33 33
 // public:
@@ -46,7 +46,7 @@ class KPopupMenu;
46 46
 //   void optionSelected(int);
47 47
 //
48 48
 // private:
49
-//   KPopupMenu* m_popup;
49
+//   TDEPopupMenu* m_popup;
50 50
 //   CSwordBackend::FilterOptions* m_filterOptions;
51 51
 //
52 52
 // signals:
@@ -56,7 +56,7 @@ class KPopupMenu;
56 56
 /** This class manages the display options of the selected modules.
57 57
   * @author The BibleTime team
58 58
   */
59
-class CDisplaySettingsButton : public KToolBarButton  {
59
+class CDisplaySettingsButton : public TDEToolBarButton  {
60 60
 	Q_OBJECT
61 61
 	
62 62
 public:
@@ -93,7 +93,7 @@ protected:
93 93
 
94 94
 	TQDict<int> m_dict;
95 95
 
96
-	KPopupMenu* m_popup;
96
+	TDEPopupMenu* m_popup;
97 97
 
98 98
 	int populateMenu();
99 99
 	bool isOptionAvailable( const CSwordModuleInfo::FilterTypes option);

+ 14
- 14
bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp View File

@@ -33,28 +33,28 @@ using namespace Profile;
33 33
 
34 34
 CCommentaryReadWindow::CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name) : CLexiconReadWindow(modules, parent,name) {}
35 35
 
36
-void CCommentaryReadWindow::insertKeyboardActions( KActionCollection* const a ) {
37
-	new KAction(
36
+void CCommentaryReadWindow::insertKeyboardActions( TDEActionCollection* const a ) {
37
+	new TDEAction(
38 38
 		i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel,
39 39
 		a, "nextBook"
40 40
 	);
41
-	new KAction(
41
+	new TDEAction(
42 42
 		i18n("Previous book"), CResMgr::displaywindows::bibleWindow::previousBook::accel,
43 43
 		a, "previousBook"
44 44
 	);
45
-	new KAction(
45
+	new TDEAction(
46 46
 		i18n("Next chapter"), CResMgr::displaywindows::bibleWindow::nextChapter::accel,
47 47
 		a, "nextChapter"
48 48
 	);
49
-	new KAction(
49
+	new TDEAction(
50 50
 		i18n("Previous chapter"), CResMgr::displaywindows::bibleWindow::previousChapter::accel,
51 51
 		a, "previousChapter"
52 52
 	);
53
-	new KAction(
53
+	new TDEAction(
54 54
 		i18n("Next verse"), CResMgr::displaywindows::bibleWindow::nextVerse::accel,
55 55
 		a, "nextVerse"
56 56
 	);
57
-	new KAction(
57
+	new TDEAction(
58 58
 		i18n("Previous verse"), CResMgr::displaywindows::bibleWindow::previousVerse::accel,
59 59
 		a, "previousVerse"
60 60
 	);
@@ -75,7 +75,7 @@ void CCommentaryReadWindow::storeProfileSettings( CProfileWindow* profileWindow
75 75
 void CCommentaryReadWindow::initToolbars() {
76 76
 	CLexiconReadWindow::initToolbars();
77 77
 
78
-	m_syncButton = new KToggleAction(i18n("Sync with active Bible"),
78
+	m_syncButton = new TDEToggleAction(i18n("Sync with active Bible"),
79 79
 									 CResMgr::displaywindows::commentaryWindow::syncWindow::icon,
80 80
 									 CResMgr::displaywindows::commentaryWindow::syncWindow::accel,
81 81
 									 actionCollection(),
@@ -107,37 +107,37 @@ void CCommentaryReadWindow::initActions() {
107 107
 	actionCollection()->action("nextEntry")->setEnabled(false);
108 108
 	actionCollection()->action("previousEntry")->setEnabled(false);
109 109
 
110
-	new KAction(
110
+	new TDEAction(
111 111
 		i18n("Next book"),
112 112
 		CResMgr::displaywindows::bibleWindow::nextBook::accel,
113 113
 		TQT_TQOBJECT(this), TQT_SLOT(nextBook()),
114 114
 		actionCollection(), "nextBook"
115 115
 	);
116
-	new KAction(
116
+	new TDEAction(
117 117
 		i18n("Previous book"),
118 118
 		CResMgr::displaywindows::bibleWindow::previousBook::accel,
119 119
 		TQT_TQOBJECT(this), TQT_SLOT(previousBook()),
120 120
 		actionCollection(), "previousBook"
121 121
 	);
122
-	new KAction(
122
+	new TDEAction(
123 123
 		i18n("Next chapter"),
124 124
 		CResMgr::displaywindows::bibleWindow::nextChapter::accel,
125 125
 		TQT_TQOBJECT(this), TQT_SLOT(nextChapter()),
126 126
 		actionCollection(), "nextChapter"
127 127
 	);
128
-	new KAction(
128
+	new TDEAction(
129 129
 		i18n("Previous chapter"),
130 130
 		CResMgr::displaywindows::bibleWindow::previousChapter::accel,
131 131
 		TQT_TQOBJECT(this), TQT_SLOT(previousChapter()),
132 132
 		actionCollection(), "previousChapter"
133 133
 	);
134
-	new KAction(
134
+	new TDEAction(
135 135
 		i18n("Next verse"),
136 136
 		CResMgr::displaywindows::bibleWindow::nextVerse::accel,
137 137
 		TQT_TQOBJECT(this), TQT_SLOT(nextVerse()),
138 138
 		actionCollection(), "nextVerse"
139 139
 	);
140
-	new KAction(
140
+	new TDEAction(
141 141
 		i18n("Previous verse"),
142 142
 		CResMgr::displaywindows::bibleWindow::previousVerse::accel,
143 143
 		TQT_TQOBJECT(this), TQT_SLOT(previousVerse()),

+ 2
- 2
bibletime/frontend/displaywindow/ccommentaryreadwindow.h View File

@@ -29,7 +29,7 @@ public:
29 29
 	/**
30 30
 	* Reimplementation.
31 31
 	*/
32
-	static void insertKeyboardActions( KActionCollection* const a );
32
+	static void insertKeyboardActions( TDEActionCollection* const a );
33 33
 
34 34
 	CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
35 35
 	/**
@@ -59,7 +59,7 @@ protected:
59 59
 	virtual void initToolbars();
60 60
 
61 61
 private:
62
-	KToggleAction* m_syncButton;
62
+	TDEToggleAction* m_syncButton;
63 63
 	CSwordVerseKey* verseKey();
64 64
 protected:
65 65
     virtual void setupPopupMenu();

+ 14
- 14
bibletime/frontend/displaywindow/cdisplaywindow.cpp View File

@@ -78,9 +78,9 @@ CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules,
78 78
 
79 79
 CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *parent, const char *name )
80 80
 #if TDE_VERSION >= 0x030200
81
-: KMainWindow(KMainWindow::NoDCOPObject, parent, name, WDestructiveClose),
81
+: TDEMainWindow(TDEMainWindow::NoDCOPObject, parent, name, WDestructiveClose),
82 82
 #else
83
-: KMainWindow(parent, name, WDestructiveClose),
83
+: TDEMainWindow(parent, name, WDestructiveClose),
84 84
 #endif
85 85
 m_mdi(parent),
86 86
 m_filterOptions(),
@@ -134,7 +134,7 @@ void CDisplayWindow::setCaption( const TQString&  ) {
134 134
 	m_mdi->emitWindowCaptionChanged();
135 135
 }
136 136
 
137
-void CDisplayWindow::insertKeyboardActions( KActionCollection* const a ) {
137
+void CDisplayWindow::insertKeyboardActions( TDEActionCollection* const a ) {
138 138
 	KStdAction::zoomIn(0, 0, a, "zoomIn"); //no slot
139 139
 	KStdAction::zoomOut(0, 0, a, "zoomOut"); //no slot
140 140
 	KStdAction::close(0, 0, a, "closeWindow"); //no slot
@@ -142,14 +142,14 @@ void CDisplayWindow::insertKeyboardActions( KActionCollection* const a ) {
142 142
 	KStdAction::copy(0, 0, a, "copySelectedText");
143 143
 	KStdAction::find(0, 0, a, "findText");
144 144
 
145
-	new KToolBarPopupAction(
145
+	new TDEToolBarPopupAction(
146 146
 		i18n("Back in history"),
147 147
 		CResMgr::displaywindows::general::backInHistory::icon,
148 148
 		CResMgr::displaywindows::general::backInHistory::accel,
149 149
 		a,
150 150
 		CResMgr::displaywindows::general::backInHistory::actionName
151 151
 	);
152
-	new KToolBarPopupAction(
152
+	new TDEToolBarPopupAction(
153 153
 		i18n("Forward in history"),
154 154
 		CResMgr::displaywindows::general::forwardInHistory::icon,
155 155
 		CResMgr::displaywindows::general::forwardInHistory::accel,
@@ -158,7 +158,7 @@ void CDisplayWindow::insertKeyboardActions( KActionCollection* const a ) {
158 158
 }
159 159
 
160 160
 void CDisplayWindow::initActions() {
161
-	new KAction(i18n("Search"),
161
+	new TDEAction(i18n("Search"),
162 162
 				CResMgr::displaywindows::general::search::icon,
163 163
 				CResMgr::displaywindows::general::search::accel,
164 164
 				TQT_TQOBJECT(this), TQT_SLOT(slotSearchInModules()),
@@ -193,13 +193,13 @@ void CDisplayWindow::initActions() {
193 193
 		actionCollection(), "findText"
194 194
 	);
195 195
 
196
-	new KToolBarPopupAction(
196
+	new TDEToolBarPopupAction(
197 197
 		i18n("Back in history"), CResMgr::displaywindows::general::backInHistory::icon, CResMgr::displaywindows::general::backInHistory::accel,
198 198
 		TQT_TQOBJECT(keyChooser()), TQT_SLOT( backInHistory() ),
199 199
 		actionCollection(), CResMgr::displaywindows::general::backInHistory::actionName
200 200
 	);
201 201
 
202
-	new KToolBarPopupAction(
202
+	new TDEToolBarPopupAction(
203 203
 		i18n("Forward in history"), CResMgr::displaywindows::general::forwardInHistory::icon, CResMgr::displaywindows::general::forwardInHistory::accel,
204 204
 		TQT_TQOBJECT(keyChooser()), TQT_SLOT( forwardInHistory() ),
205 205
 		actionCollection(), CResMgr::displaywindows::general::forwardInHistory::actionName
@@ -370,22 +370,22 @@ const bool CDisplayWindow::init() {
370 370
 }
371 371
 
372 372
 /** Returns the main toolbar. */
373
-KToolBar* const CDisplayWindow::mainToolBar() const {
373
+TDEToolBar* const CDisplayWindow::mainToolBar() const {
374 374
 	return m_mainToolBar;
375 375
 }
376 376
 
377 377
 /** Returns the main toolbar. */
378
-KToolBar* const CDisplayWindow::buttonsToolBar() const {
378
+TDEToolBar* const CDisplayWindow::buttonsToolBar() const {
379 379
 	return m_buttonsToolBar;
380 380
 }
381 381
 
382 382
 /** Sets the main toolbar. */
383
-void CDisplayWindow::setMainToolBar( KToolBar* bar ) {
383
+void CDisplayWindow::setMainToolBar( TDEToolBar* bar ) {
384 384
 	m_mainToolBar = bar;
385 385
 }
386 386
 
387 387
 /** Sets the main toolbar. */
388
-void CDisplayWindow::setButtonsToolBar( KToolBar* bar ) {
388
+void CDisplayWindow::setButtonsToolBar( TDEToolBar* bar ) {
389 389
 	m_buttonsToolBar = bar;
390 390
 }
391 391
 
@@ -449,10 +449,10 @@ void CDisplayWindow::updatePopupMenu() {}
449 449
 
450 450
 
451 451
 ///** Returns the installed popup menu. */
452
-KPopupMenu* const CDisplayWindow::popup() {
452
+TDEPopupMenu* const CDisplayWindow::popup() {
453 453
 	// tqWarning("CReadWindow::popup()");
454 454
 	if (!m_popupMenu) {
455
-		m_popupMenu = new KPopupMenu(this);
455
+		m_popupMenu = new TDEPopupMenu(this);
456 456
 		connect(m_popupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(updatePopupMenu()));
457 457
 		if (displayWidget()) {
458 458
 			displayWidget()->installPopup(m_popupMenu);

+ 15
- 15
bibletime/frontend/displaywindow/cdisplaywindow.h View File

@@ -41,15 +41,15 @@ class CDisplay;
41 41
 class CKeyChooser;
42 42
 class CModuleChooserBar;
43 43
 class CDisplaySettingsButton;
44
-class KAccel;
45
-class KToolBar;
46
-class KPopupMenu;
44
+class TDEAccel;
45
+class TDEToolBar;
46
+class TDEPopupMenu;
47 47
 
48 48
 /** The base class for all display windows of BibleTime.
49 49
   * @author The BibleTime team
50 50
   */
51 51
 
52
-class CDisplayWindow : public KMainWindow, public CPointers  {
52
+class CDisplayWindow : public TDEMainWindow, public CPointers  {
53 53
 	Q_OBJECT
54 54
   
55 55
 public:
@@ -61,10 +61,10 @@ public:
61 61
 	static CReadWindow* createReadInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const char* name = 0);
62 62
 	static CWriteWindow* createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const WriteWindowType type = HTMLWindow, const char* name = 0);
63 63
 	/**
64
-	* Insert the keyboard accelerators of this window into the given KAccel object.
64
+	* Insert the keyboard accelerators of this window into the given TDEAccel object.
65 65
 	*/
66
-	//   static void insertKeyboardActions( KAccel* const accel );
67
-	static void insertKeyboardActions( KActionCollection* const a );
66
+	//   static void insertKeyboardActions( TDEAccel* const accel );
67
+	static void insertKeyboardActions( TDEActionCollection* const a );
68 68
 
69 69
 	CMDIArea* const mdi() const;
70 70
 	/**
@@ -134,19 +134,19 @@ public:
134 134
 	/**
135 135
 	* Sets the main toolbar.
136 136
 	*/
137
-	void setMainToolBar( KToolBar* bar );
137
+	void setMainToolBar( TDEToolBar* bar );
138 138
 	/**
139 139
 	* Sets the buttons toolbar.
140 140
 	*/
141
-	void setButtonsToolBar( KToolBar* bar );
141
+	void setButtonsToolBar( TDEToolBar* bar );
142 142
 	/**
143 143
 	* Returns the main toolbar.
144 144
 	*/
145
-	KToolBar* const mainToolBar() const;
145
+	TDEToolBar* const mainToolBar() const;
146 146
 	/**
147 147
 	* Returns the buttons toolbar.
148 148
 	*/
149
-	KToolBar* const buttonsToolBar() const;
149
+	TDEToolBar* const buttonsToolBar() const;
150 150
 	/**
151 151
 	* Initialize the toolbars
152 152
 	*/
@@ -236,7 +236,7 @@ protected:
236 236
 	/**
237 237
 	* Returns the installed popup menu.
238 238
 	*/
239
-	KPopupMenu* const popup();
239
+	TDEPopupMenu* const popup();
240 240
 	virtual void closeEvent(TQCloseEvent* e);
241 241
 
242 242
 protected slots:
@@ -267,9 +267,9 @@ private:
267 267
 	CSwordKey* m_swordKey;
268 268
 	bool m_isReady;
269 269
 	CModuleChooserBar* m_moduleChooserBar;
270
-	KToolBar* m_mainToolBar;
271
-	KToolBar* m_buttonsToolBar;
272
-	KPopupMenu* m_popupMenu;
270
+	TDEToolBar* m_mainToolBar;
271
+	TDEToolBar* m_buttonsToolBar;
272
+	TDEPopupMenu* m_popupMenu;
273 273
 	CDisplay* m_displayWidget;
274 274
 };
275 275
 

+ 6
- 6
bibletime/frontend/displaywindow/chtmlwritewindow.cpp View File

@@ -36,7 +36,7 @@ void CHTMLWriteWindow::initView() {
36 36
 	setDisplayWidget( writeDisplay );
37 37
 	setCentralWidget( displayWidget()->view() );
38 38
 
39
-	setMainToolBar( new KToolBar(this) );
39
+	setMainToolBar( new TDEToolBar(this) );
40 40
 	mainToolBar()->setFullSize(true);
41 41
 	addDockWindow(mainToolBar());
42 42
 
@@ -56,7 +56,7 @@ void CHTMLWriteWindow::initConnections() {
56 56
 
57 57
 void CHTMLWriteWindow::initToolbars() {
58 58
 	//setup the toolbar
59
-	m_actions.syncWindow = new KToggleAction(i18n("Sync with active Bible"),
59
+	m_actions.syncWindow = new TDEToggleAction(i18n("Sync with active Bible"),
60 60
 						   CResMgr::displaywindows::commentaryWindow::syncWindow::icon,
61 61
 						   CResMgr::displaywindows::commentaryWindow::syncWindow::accel,
62 62
 						   actionCollection(),
@@ -65,7 +65,7 @@ void CHTMLWriteWindow::initToolbars() {
65 65
 	m_actions.syncWindow->setToolTip(CResMgr::displaywindows::commentaryWindow::syncWindow::tooltip);
66 66
 	m_actions.syncWindow->plug(mainToolBar());
67 67
 
68
-	m_actions.saveText = new KAction( i18n("Save text"),
68
+	m_actions.saveText = new TDEAction( i18n("Save text"),
69 69
 									  CResMgr::displaywindows::writeWindow::saveText::icon,
70 70
 									  CResMgr::displaywindows::writeWindow::saveText::accel,
71 71
 									  TQT_TQOBJECT(this), TQT_SLOT( saveCurrentText()  ),
@@ -75,7 +75,7 @@ void CHTMLWriteWindow::initToolbars() {
75 75
 	m_actions.saveText->setToolTip( CResMgr::displaywindows::writeWindow::saveText::tooltip );
76 76
 	m_actions.saveText->plug(mainToolBar());
77 77
 
78
-	m_actions.deleteEntry = new KAction(i18n("Delete current entry"),
78
+	m_actions.deleteEntry = new TDEAction(i18n("Delete current entry"),
79 79
 										CResMgr::displaywindows::writeWindow::deleteEntry::icon,
80 80
 										CResMgr::displaywindows::writeWindow::deleteEntry::accel,
81 81
 										TQT_TQOBJECT(this), TQT_SLOT(deleteEntry()),
@@ -85,7 +85,7 @@ void CHTMLWriteWindow::initToolbars() {
85 85
 	m_actions.deleteEntry->setToolTip( CResMgr::displaywindows::writeWindow::deleteEntry::tooltip );
86 86
 	m_actions.deleteEntry->plug(mainToolBar());
87 87
 
88
-	m_actions.restoreText = new KAction(i18n("Restore original text"),
88
+	m_actions.restoreText = new TDEAction(i18n("Restore original text"),
89 89
 										CResMgr::displaywindows::writeWindow::restoreText::icon,
90 90
 										CResMgr::displaywindows::writeWindow::restoreText::accel,
91 91
 										TQT_TQOBJECT(this), TQT_SLOT(restoreText()), actionCollection(),
@@ -95,7 +95,7 @@ void CHTMLWriteWindow::initToolbars() {
95 95
 	m_actions.restoreText->plug(mainToolBar());
96 96
 
97 97
 
98
-	KToolBar* bar = new KToolBar(this);
98
+	TDEToolBar* bar = new TDEToolBar(this);
99 99
 	bar->setFullSize(true);
100 100
 	addDockWindow(bar);
101 101
 

+ 5
- 5
bibletime/frontend/displaywindow/chtmlwritewindow.h View File

@@ -18,7 +18,7 @@
18 18
 //TQt includes
19 19
 #include <tqwidget.h>
20 20
 
21
-class KAction;
21
+class TDEAction;
22 22
 
23 23
 /** The WYSIWYG implementation of the editor.
24 24
   * @author The BibleTime team
@@ -64,10 +64,10 @@ protected slots:
64 64
 
65 65
 private:
66 66
 	struct {
67
-		KAction* saveText;
68
-		KAction* restoreText;
69
-		KAction* deleteEntry;
70
-		KToggleAction* syncWindow;
67
+		TDEAction* saveText;
68
+		TDEAction* restoreText;
69
+		TDEAction* deleteEntry;
70
+		TDEToggleAction* syncWindow;
71 71
 	}
72 72
 	m_actions;
73 73
 };

+ 31
- 31
bibletime/frontend/displaywindow/clexiconreadwindow.cpp View File

@@ -42,36 +42,36 @@ CLexiconReadWindow::CLexiconReadWindow(ListCSwordModuleInfo moduleList, CMDIArea
42 42
 
43 43
 CLexiconReadWindow::~CLexiconReadWindow() {}
44 44
 
45
-void CLexiconReadWindow::insertKeyboardActions( KActionCollection* const a ) {
46
-	new KAction(
45
+void CLexiconReadWindow::insertKeyboardActions( TDEActionCollection* const a ) {
46
+	new TDEAction(
47 47
 		i18n("Next entry"), CResMgr::displaywindows::lexiconWindow::nextEntry::accel,
48 48
 		a, "nextEntry"
49 49
 	);
50
-	new KAction(
50
+	new TDEAction(
51 51
 		i18n("Previous entry"), CResMgr::displaywindows::lexiconWindow::previousEntry::accel,
52 52
 		a, "previousEntry"
53 53
 	);
54 54
 
55
-	//  new KAction(i18n("Copy reference only"), KShortcut(0), a, "copyReferenceOnly");
56
-	new KAction(i18n("Copy entry with text"), KShortcut(0), a, "copyEntryWithText");
57
-	//  new KAction(i18n("Copy selected text"), KShortcut(0), a, "copySelectedText");
58
-	new KAction(i18n("Save entry as plain text"), KShortcut(0), a, "saveEntryAsPlainText");
59
-	new KAction(i18n("Save entry as HTML"), KShortcut(0), a, "saveEntryAsHTML");
60
-	//   new KAction(i18n("Print reference only"), KShortcut(0), a, "printReferenceOnly");
61
-	new KAction(i18n("Print entry with text"), KShortcut(0), a, "printEntryWithText");
55
+	//  new TDEAction(i18n("Copy reference only"), TDEShortcut(0), a, "copyReferenceOnly");
56
+	new TDEAction(i18n("Copy entry with text"), TDEShortcut(0), a, "copyEntryWithText");
57
+	//  new TDEAction(i18n("Copy selected text"), TDEShortcut(0), a, "copySelectedText");
58
+	new TDEAction(i18n("Save entry as plain text"), TDEShortcut(0), a, "saveEntryAsPlainText");
59
+	new TDEAction(i18n("Save entry as HTML"), TDEShortcut(0), a, "saveEntryAsHTML");
60
+	//   new TDEAction(i18n("Print reference only"), TDEShortcut(0), a, "printReferenceOnly");
61
+	new TDEAction(i18n("Print entry with text"), TDEShortcut(0), a, "printEntryWithText");
62 62
 }
63 63
 
64 64
 void CLexiconReadWindow::initActions() {
65 65
 	CReadWindow::initActions();
66 66
 
67
-	m_actions.backInHistory = dynamic_cast<KToolBarPopupAction*>(
67
+	m_actions.backInHistory = dynamic_cast<TDEToolBarPopupAction*>(
68 68
 								  actionCollection()->action(
69 69
 									  CResMgr::displaywindows::general::backInHistory::actionName
70 70
 								  )
71 71
 							  );
72 72
 	Q_ASSERT(m_actions.backInHistory);
73 73
 
74
-	m_actions.forwardInHistory = dynamic_cast<KToolBarPopupAction*>(
74
+	m_actions.forwardInHistory = dynamic_cast<TDEToolBarPopupAction*>(
75 75
 									 actionCollection()->action(
76 76
 										 CResMgr::displaywindows::general::forwardInHistory::actionName
77 77
 									 )
@@ -79,12 +79,12 @@ void CLexiconReadWindow::initActions() {
79 79
 
80 80
 	Q_ASSERT(m_actions.forwardInHistory);
81 81
 
82
-	new KAction(
82
+	new TDEAction(
83 83
 		i18n("Next entry"), CResMgr::displaywindows::lexiconWindow::nextEntry::accel,
84 84
 		TQT_TQOBJECT(this), TQT_SLOT( nextEntry() ),
85 85
 		actionCollection(), "nextEntry"
86 86
 	);
87
-	new KAction(
87
+	new TDEAction(
88 88
 		i18n("Previous entry"), CResMgr::displaywindows::lexiconWindow::previousEntry::accel,
89 89
 		TQT_TQOBJECT(this), TQT_SLOT( previousEntry() ),
90 90
 		actionCollection(), "previousEntry"
@@ -96,8 +96,8 @@ void CLexiconReadWindow::initActions() {
96 96
 	m_actions.findText = actionCollection()->action("findText");
97 97
 	Q_ASSERT(m_actions.findText);
98 98
 	
99
-	//m_actions.findStrongs = new KAction(i18n("Strong's Search"), KShortcut(0),this, TQT_SLOT(openSearchStrongsDialog()), actionCollection(), "findStrongs");
100
-	m_actions.findStrongs = new KAction(
99
+	//m_actions.findStrongs = new TDEAction(i18n("Strong's Search"), TDEShortcut(0),this, TQT_SLOT(openSearchStrongsDialog()), actionCollection(), "findStrongs");
100
+	m_actions.findStrongs = new TDEAction(
101 101
 		i18n("Strong's Search"),
102 102
 		CResMgr::displaywindows::general::findStrongs::icon,
103 103
 		CResMgr::displaywindows::general::findStrongs::accel,
@@ -105,20 +105,20 @@ void CLexiconReadWindow::initActions() {
105 105
 		actionCollection(),
106 106
 		CResMgr::displaywindows::general::findStrongs::actionName);
107 107
 
108
-	m_actions.copy.reference = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
108
+	m_actions.copy.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
109 109
 
110
-	m_actions.copy.entry = new KAction(i18n("Entry with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAll()), actionCollection(), "copyEntryWithText");
110
+	m_actions.copy.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAll()), actionCollection(), "copyEntryWithText");
111 111
 
112 112
 	m_actions.copy.selectedText = actionCollection()->action("copySelectedText");
113 113
 	Q_ASSERT(m_actions.copy.selectedText);
114 114
 
115
-	m_actions.save.entryAsPlain = new KAction(i18n("Entry as plain text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain");
115
+	m_actions.save.entryAsPlain = new TDEAction(i18n("Entry as plain text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain");
116 116
 
117
-	m_actions.save.entryAsHTML = new KAction(i18n("Entry as HTML"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML");
117
+	m_actions.save.entryAsHTML = new TDEAction(i18n("Entry as HTML"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML");
118 118
 
119
-	m_actions.print.reference = new KAction(i18n("Reference only"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly");
119
+	m_actions.print.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly");
120 120
 
121
-	m_actions.print.entry = new KAction(i18n("Entry with text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printEntryWithText");
121
+	m_actions.print.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printEntryWithText");
122 122
 
123 123
 	// init with the user defined settings
124 124
 	CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, actionCollection());
@@ -157,7 +157,7 @@ void CLexiconReadWindow::initConnections() {
157 157
 void CLexiconReadWindow::initView() {
158 158
 	setDisplayWidget( CDisplay::createReadInstance(this) );
159 159
 
160
-	setMainToolBar( new KToolBar(this) );
160
+	setMainToolBar( new TDEToolBar(this) );
161 161
 	addDockWindow(mainToolBar());
162 162
 
163 163
 	setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
@@ -168,7 +168,7 @@ void CLexiconReadWindow::initView() {
168 168
 	setModuleChooserBar( new CModuleChooserBar(modules(), modules().first()->type(), this) );
169 169
 	addDockWindow(moduleChooserBar());
170 170
 
171
-	setButtonsToolBar( new KToolBar(this) );
171
+	setButtonsToolBar( new TDEToolBar(this) );
172 172
 	addDockWindow(buttonsToolBar());
173 173
 	
174 174
 	setIcon(CToolClass::getIconForModule(modules().first()));
@@ -182,7 +182,7 @@ void CLexiconReadWindow::initToolbars() {
182 182
 	m_actions.forwardInHistory->plug( mainToolBar(),1 ); //2nd button
183 183
 
184 184
 	//buttons toolbar
185
-	KAction* action = actionCollection()->action(
185
+	TDEAction* action = actionCollection()->action(
186 186
 		CResMgr::displaywindows::general::search::actionName);
187 187
 	Q_ASSERT( action );
188 188
 	if (action) {
@@ -199,31 +199,31 @@ void CLexiconReadWindow::initToolbars() {
199 199
 void CLexiconReadWindow::setupPopupMenu() {
200 200
 	popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Lexicon window"));
201 201
 
202
-	//   m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(selectAll()), actionCollection());
202
+	//   m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(selectAll()), actionCollection());
203 203
 	m_actions.findText->plug(popup());
204 204
 	m_actions.findStrongs->plug(popup());
205 205
 	
206 206
 	m_actions.selectAll->plug(popup());
207 207
 
208 208
 	
209
-	(new KActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
209
+	(new TDEActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
210 210
 
211
-	m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::lexiconWindow::copyMenu::icon, actionCollection());
211
+	m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::displaywindows::lexiconWindow::copyMenu::icon, actionCollection());
212 212
 	m_actions.copyMenu->setDelayed(false);
213 213
 
214 214
 	m_actions.copyMenu->insert(m_actions.copy.reference);
215 215
 	m_actions.copyMenu->insert(m_actions.copy.entry);
216
-	m_actions.copyMenu->insert(new KActionSeparator(TQT_TQOBJECT(this)));
216
+	m_actions.copyMenu->insert(new TDEActionSeparator(TQT_TQOBJECT(this)));
217 217
 	m_actions.copyMenu->insert(m_actions.copy.selectedText);
218 218
 	m_actions.copyMenu->plug(popup());
219 219
 
220
-	m_actions.saveMenu = new KActionMenu(i18n("Save..."), CResMgr::displaywindows::lexiconWindow::saveMenu::icon, actionCollection());
220
+	m_actions.saveMenu = new TDEActionMenu(i18n("Save..."), CResMgr::displaywindows::lexiconWindow::saveMenu::icon, actionCollection());
221 221
 	m_actions.saveMenu->setDelayed(false);
222 222
 	m_actions.saveMenu->insert(m_actions.save.entryAsPlain);
223 223
 	m_actions.saveMenu->insert(m_actions.save.entryAsHTML);
224 224
 	m_actions.saveMenu->plug(popup());
225 225
 
226
-	m_actions.printMenu = new KActionMenu(i18n("Print..."), CResMgr::displaywindows::lexiconWindow::printMenu::icon, actionCollection());
226
+	m_actions.printMenu = new TDEActionMenu(i18n("Print..."), CResMgr::displaywindows::lexiconWindow::printMenu::icon, actionCollection());
227 227
 	m_actions.printMenu->setDelayed(false);
228 228
 	m_actions.printMenu->insert(m_actions.print.reference);
229 229
 	m_actions.printMenu->insert(m_actions.print.entry);

+ 19
- 19
bibletime/frontend/displaywindow/clexiconreadwindow.h View File

@@ -24,7 +24,7 @@
24 24
 class CSwordKey;
25 25
 class CSwordLDKey;
26 26
 //KDE
27
-class KToolBarPopupAction;
27
+class TDEToolBarPopupAction;
28 28
 
29 29
 /**
30 30
   *@author The BibleTime team
@@ -47,8 +47,8 @@ public:
47 47
 	/**
48 48
 	* Reimplementation.
49 49
 	*/
50
-	//   static void insertKeyboardActions( KAccel* a );
51
-	static void insertKeyboardActions( KActionCollection* const a );
50
+	//   static void insertKeyboardActions( TDEAccel* a );
51
+	static void insertKeyboardActions( TDEActionCollection* const a );
52 52
 
53 53
 protected:
54 54
 	virtual void initActions();
@@ -60,33 +60,33 @@ protected:
60 60
 
61 61
 
62 62
 	struct ActionsStruct {
63
-		KToolBarPopupAction* backInHistory;
64
-		KToolBarPopupAction* forwardInHistory;
63
+		TDEToolBarPopupAction* backInHistory;
64
+		TDEToolBarPopupAction* forwardInHistory;
65 65
 
66
-		KAction* selectAll;
67
-		KAction* findText;
68
-		KAction* findStrongs;
66
+		TDEAction* selectAll;
67
+		TDEAction* findText;
68
+		TDEAction* findStrongs;
69 69
 
70
-		KActionMenu* copyMenu;
70
+		TDEActionMenu* copyMenu;
71 71
 		struct {
72
-			KAction* reference;
73
-			KAction* entry;
74
-			KAction* selectedText;
72
+			TDEAction* reference;
73
+			TDEAction* entry;
74
+			TDEAction* selectedText;
75 75
 		}
76 76
 		copy;
77 77
 
78
-		KActionMenu* saveMenu;
78
+		TDEActionMenu* saveMenu;
79 79
 		struct {
80
-			KAction* reference;
81
-			KAction* entryAsPlain;
82
-			KAction* entryAsHTML;
80
+			TDEAction* reference;
81
+			TDEAction* entryAsPlain;
82
+			TDEAction* entryAsHTML;
83 83
 		}
84 84
 		save;
85 85
 
86
-		KActionMenu* printMenu;
86
+		TDEActionMenu* printMenu;
87 87
 		struct {
88
-			KAction* reference;
89
-			KAction* entry;
88
+			TDEAction* reference;
89
+			TDEAction* entry;
90 90
 		}
91 91
 		print;
92 92
 	}

+ 1
- 1
bibletime/frontend/displaywindow/cmodulechooserbar.cpp View File

@@ -15,7 +15,7 @@
15 15
 #include <tqtimer.h>
16 16
 
17 17
 CModuleChooserBar::CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *parent, const char *name )
18
-: KToolBar(parent,name),
18
+: TDEToolBar(parent,name),
19 19
 m_moduleType(type),
20 20
 m_idCounter(0),
21 21
 m_buttonLimit(-1) //-1 means no limit

+ 1
- 1
bibletime/frontend/displaywindow/cmodulechooserbar.h View File

@@ -29,7 +29,7 @@
29 29
 /**
30 30
   * @author The BibleTime team
31 31
   */
32
-class CModuleChooserBar : public KToolBar  {
32
+class CModuleChooserBar : public TDEToolBar  {
33 33
 	Q_OBJECT
34 34
   
35 35
 public:

+ 7
- 7
bibletime/frontend/displaywindow/cmodulechooserbutton.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include <kiconloader.h>
29 29
 
30 30
 CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name )
31
-: KToolBarButton(iconName(), id, parent, name),
31
+: TDEToolBarButton(iconName(), id, parent, name),
32 32
 m_id(id), m_popup(0), m_moduleChooserBar(parent) {
33 33
 	m_moduleType = type;
34 34
 	m_module = useModule;
@@ -81,7 +81,7 @@ const TQString CModuleChooserButton::iconName() {
81 81
 }
82 82
 
83 83
 CSwordModuleInfo* CModuleChooserButton::module() {
84
-	for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
84
+	for ( TDEPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
85 85
 		for (unsigned int i = 0; i < popup->count(); i++) {
86 86
 			if ( m_popup->isItemChecked(popup->idAt(i)) ) {
87 87
 				TQString mod = popup->text(popup->idAt(i)).remove('&');
@@ -100,7 +100,7 @@ int CModuleChooserButton::getId() const {
100 100
 
101 101
 /** Is called after a module was selected in the popup */
102 102
 void CModuleChooserButton::moduleChosen( int ID ) {
103
-	for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
103
+	for ( TDEPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
104 104
 		for (unsigned int i = 0; i < popup->count(); i++) {
105 105
 			popup->setItemChecked(popup->idAt(i),false);
106 106
 		}
@@ -145,7 +145,7 @@ void CModuleChooserButton::populateMenu() {
145 145
 	delete m_popup;
146 146
 
147 147
 	//create a new, empty popup
148
-	m_popup = new KPopupMenu(this);
148
+	m_popup = new TDEPopupMenu(this);
149 149
 
150 150
 	if (m_module) {
151 151
 		m_titleId = m_popup->insertTitle( i18n("Select a work") );
@@ -166,7 +166,7 @@ void CModuleChooserButton::populateMenu() {
166 166
 	setPopup(m_popup, true);
167 167
 
168 168
 	TQStringList languages;
169
-	TQDict<KPopupMenu> langdict;
169
+	TQDict<TDEPopupMenu> langdict;
170 170
 
171 171
 	//the modules list contains only the modules we can use, i.e. same type and same features
172 172
 	ListCSwordModuleInfo modules;
@@ -200,7 +200,7 @@ void CModuleChooserButton::populateMenu() {
200 200
 		if (languages.find( lang ) == languages.end() ) { //this lang was not yet added
201 201
 			languages += lang;
202 202
 
203
-			KPopupMenu* menu = new KPopupMenu;
203
+			TDEPopupMenu* menu = new TDEPopupMenu;
204 204
 			langdict.insert(lang, menu );
205 205
 			m_submenus.append(menu);
206 206
 			connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleChosen(int)));
@@ -254,7 +254,7 @@ void CModuleChooserButton::updateMenuItems() {
254 254
 	CSwordModuleInfo* module = 0;
255 255
 	ListCSwordModuleInfo chosenModules = m_moduleChooserBar->getModuleList();
256 256
 
257
-	for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
257
+	for ( TDEPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
258 258
 
259 259
 		for (unsigned int i = 0; i < popup->count(); i++) {
260 260
 			moduleName = popup->text(popup->idAt(i)).remove('&');

+ 4
- 4
bibletime/frontend/displaywindow/cmodulechooserbutton.h View File

@@ -24,14 +24,14 @@
24 24
 #include <ktoolbarbutton.h>
25 25
 #include <kpopupmenu.h>
26 26
 
27
-class KPopupMenu;
27
+class TDEPopupMenu;
28 28
 class CModuleChooserBar;
29 29
 
30 30
 /** The CModuleChooserButton displays a list of submenus sorted by language which contain the possible modules
31 31
   * which can be displayed together with the first one.
32 32
   * @author The BibleTime team
33 33
   */
34
-class CModuleChooserButton : public KToolBarButton, public CPointers  {
34
+class CModuleChooserButton : public TDEToolBarButton, public CPointers  {
35 35
 	Q_OBJECT
36 36
   
37 37
 public:
@@ -61,8 +61,8 @@ private:
61 61
 	CSwordModuleInfo::ModuleType m_moduleType;
62 62
 	CSwordModuleInfo* m_module;
63 63
 
64
-	KPopupMenu* m_popup;
65
-	TQPtrList<KPopupMenu> m_submenus;
64
+	TDEPopupMenu* m_popup;
65
+	TQPtrList<TDEPopupMenu> m_submenus;
66 66
 
67 67
 	CModuleChooserBar* m_moduleChooserBar;
68 68
 

+ 6
- 6
bibletime/frontend/displaywindow/cplainwritewindow.cpp View File

@@ -41,7 +41,7 @@ void CPlainWriteWindow::initView() {
41 41
 	setDisplayWidget( CDisplay::createWriteInstance(this) );
42 42
 	setCentralWidget( displayWidget()->view() );
43 43
 
44
-	setMainToolBar( new KToolBar(this) );
44
+	setMainToolBar( new TDEToolBar(this) );
45 45
 	mainToolBar()->setFullSize(true);
46 46
 	addDockWindow(mainToolBar());
47 47
 
@@ -52,7 +52,7 @@ void CPlainWriteWindow::initView() {
52 52
 }
53 53
 
54 54
 void CPlainWriteWindow::initToolbars() {
55
-	m_actions.syncWindow = new KToggleAction(i18n("Sync with active Bible"),
55
+	m_actions.syncWindow = new TDEToggleAction(i18n("Sync with active Bible"),
56 56
 						   CResMgr::displaywindows::commentaryWindow::syncWindow::icon,
57 57
 						   CResMgr::displaywindows::commentaryWindow::syncWindow::accel,
58 58
 						   actionCollection(),
@@ -62,7 +62,7 @@ void CPlainWriteWindow::initToolbars() {
62 62
 	m_actions.syncWindow->plug(mainToolBar());
63 63
 
64 64
 
65
-	m_actions.saveText = new KAction(i18n("Save text"),
65
+	m_actions.saveText = new TDEAction(i18n("Save text"),
66 66
 									 CResMgr::displaywindows::writeWindow::saveText::icon,
67 67
 									 CResMgr::displaywindows::writeWindow::saveText::accel,
68 68
 									 TQT_TQOBJECT(this), TQT_SLOT(saveCurrentText()),
@@ -73,7 +73,7 @@ void CPlainWriteWindow::initToolbars() {
73 73
 	m_actions.saveText->plug(mainToolBar());
74 74
 
75 75
 
76
-	m_actions.deleteEntry = new KAction(i18n("Delete current entry"),
76
+	m_actions.deleteEntry = new TDEAction(i18n("Delete current entry"),
77 77
 										CResMgr::displaywindows::writeWindow::deleteEntry::icon,
78 78
 										CResMgr::displaywindows::writeWindow::deleteEntry::accel,
79 79
 										TQT_TQOBJECT(this), TQT_SLOT(deleteEntry()),
@@ -84,7 +84,7 @@ void CPlainWriteWindow::initToolbars() {
84 84
 	m_actions.deleteEntry->plug(mainToolBar());
85 85
 
86 86
 
87
-	m_actions.restoreText = new KAction(i18n("Restore original text"),
87
+	m_actions.restoreText = new TDEAction(i18n("Restore original text"),
88 88
 										CResMgr::displaywindows::writeWindow::restoreText::icon,
89 89
 										CResMgr::displaywindows::writeWindow::restoreText::accel,
90 90
 										TQT_TQOBJECT(this), TQT_SLOT(restoreText()),
@@ -172,5 +172,5 @@ const bool CPlainWriteWindow::syncAllowed() const {
172 172
 void CPlainWriteWindow::initActions() {
173 173
 }
174 174
 
175
-void CPlainWriteWindow::insertKeyboardActions( KActionCollection* const ) {
175
+void CPlainWriteWindow::insertKeyboardActions( TDEActionCollection* const ) {
176 176
 }

+ 8
- 8
bibletime/frontend/displaywindow/cplainwritewindow.h View File

@@ -19,8 +19,8 @@
19 19
 #include <tqwidget.h>
20 20
 
21 21
 
22
-class KAction;
23
-class KToggleAction;
22
+class TDEAction;
23
+class TDEToggleAction;
24 24
 
25 25
 /** The write window class which offers a plain editor for source code editing.
26 26
   * @author The BibleTime team
@@ -63,16 +63,16 @@ protected: // Protected methods
63 63
 	 */
64 64
 	virtual void initActions();
65 65
 	/**
66
-	* Insert the keyboard accelerators of this window into the given KAccel object.
66
+	* Insert the keyboard accelerators of this window into the given TDEAccel object.
67 67
 	*/
68
-	static void insertKeyboardActions( KActionCollection* const a );
68
+	static void insertKeyboardActions( TDEActionCollection* const a );
69 69
 
70 70
 private:
71 71
 	struct {
72
-		KAction* saveText;
73
-		KAction* deleteEntry;
74
-		KAction* restoreText;
75
-		KToggleAction* syncWindow;
72
+		TDEAction* saveText;
73
+		TDEAction* deleteEntry;
74
+		TDEAction* restoreText;
75
+		TDEToggleAction* syncWindow;
76 76
 	}
77 77
 	m_actions;
78 78
 

+ 1
- 1
bibletime/frontend/displaywindow/creadwindow.cpp View File

@@ -165,7 +165,7 @@ void CReadWindow::applyProfileSettings(CProfileWindow * const settings) {
165 165
 	setUpdatesEnabled(true);
166 166
 }
167 167
 
168
-void CReadWindow::insertKeyboardActions( KActionCollection* const ) {}
168
+void CReadWindow::insertKeyboardActions( TDEActionCollection* const ) {}
169 169
 
170 170
 /** No descriptions */
171 171
 void CReadWindow::copyDisplayedText() {

+ 3
- 3
bibletime/frontend/displaywindow/creadwindow.h View File

@@ -22,7 +22,7 @@
22 22
 #include <tqwidget.h>
23 23
 #include <tqpopupmenu.h>
24 24
 
25
-class KPopupMenu;
25
+class TDEPopupMenu;
26 26
 
27 27
 /** The base class for all read-only display windows.
28 28
   * @author The BibleTime team
@@ -32,8 +32,8 @@ class CReadWindow : public CDisplayWindow  {
32 32
 	Q_OBJECT
33 33
   
34 34
 public:
35
-	//  static void insertKeyboardActions( KAccel* const a );
36
-	static void insertKeyboardActions( KActionCollection* const a );
35
+	//  static void insertKeyboardActions( TDEAccel* const a );
36
+	static void insertKeyboardActions( TDEActionCollection* const a );
37 37
 
38 38
 	CReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
39 39
 	virtual ~CReadWindow();

+ 3
- 3
bibletime/frontend/displaywindow/cwritewindow.cpp View File

@@ -28,11 +28,11 @@ CWriteWindow::CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const
28 28
 CWriteWindow::~CWriteWindow() {}
29 29
 
30 30
 
31
-// void CWriteWindow::insertKeyboardActions( KAccel* const /*a*/ ) {
31
+// void CWriteWindow::insertKeyboardActions( TDEAccel* const /*a*/ ) {
32 32
 //
33 33
 // };
34
-void CWriteWindow::insertKeyboardActions( KActionCollection* const ) {
35
-	/* new KAction(
34
+void CWriteWindow::insertKeyboardActions( TDEActionCollection* const ) {
35
+	/* new TDEAction(
36 36
 	  i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel,
37 37
 	  a, "nextBook"
38 38
 	 );*/

+ 1
- 1
bibletime/frontend/displaywindow/cwritewindow.h View File

@@ -27,7 +27,7 @@ class CWriteWindow : public CDisplayWindow  {
27 27
 	Q_OBJECT
28 28
   
29 29
 public:
30
-	static void insertKeyboardActions( KActionCollection* const a );
30
+	static void insertKeyboardActions( TDEActionCollection* const a );
31 31
 
32 32
 	CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
33 33
 	virtual ~CWriteWindow();

+ 6
- 6
bibletime/frontend/keychooser/cbooktreechooser.cpp View File

@@ -26,7 +26,7 @@
26 26
 ////////////
27 27
 
28 28
 CBookTreeChooser::TreeItem::TreeItem(TQListViewItem* parent, TQListViewItem* after, CSwordTreeKey* key, const TQString keyName)
29
-: KListViewItem(parent, after),
29
+: TDEListViewItem(parent, after),
30 30
 m_key(key),
31 31
 m_keyName(keyName) {
32 32
 	//tqDebug("first CBookTreeChooser::TreeItem ctor");
@@ -40,7 +40,7 @@ m_keyName(keyName) {
40 40
 };
41 41
 
42 42
 CBookTreeChooser::TreeItem::TreeItem(TQListViewItem* parent,CSwordTreeKey* key, const TQString keyName)
43
-: KListViewItem(parent),
43
+: TDEListViewItem(parent),
44 44
 m_key(key),
45 45
 m_keyName(keyName) {
46 46
 	//tqDebug("second CBookTreeChooser::TreeItem ctor");
@@ -54,7 +54,7 @@ m_keyName(keyName) {
54 54
 };
55 55
 
56 56
 CBookTreeChooser::TreeItem::TreeItem(TQListView* view, TQListViewItem* after,CSwordTreeKey* key, const TQString keyName)
57
-: KListViewItem(view,after),
57
+: TDEListViewItem(view,after),
58 58
 m_key(key),
59 59
 m_keyName(keyName) {
60 60
 	//tqDebug("third CBookTreeChooser::TreeItem ctor");
@@ -80,7 +80,7 @@ void CBookTreeChooser::TreeItem::setup() {
80 80
 
81 81
 	m_key->setOffset( offset );
82 82
 
83
-	KListViewItem::setup();
83
+	TDEListViewItem::setup();
84 84
 }
85 85
 
86 86
 void CBookTreeChooser::TreeItem::createChilds() {
@@ -119,7 +119,7 @@ void CBookTreeChooser::TreeItem::setOpen(bool o) {
119 119
 		listView()->viewport()->unsetCursor();
120 120
 	}
121 121
 
122
-	KListViewItem::setOpen(o);
122
+	TDEListViewItem::setOpen(o);
123 123
 }
124 124
 
125 125
 //////////////////////////////////
@@ -137,7 +137,7 @@ m_key( dynamic_cast<CSwordTreeKey*>(key) ) {
137 137
 	//now setup the keychooser widgets
138 138
 	TQHBoxLayout* layout = new TQHBoxLayout(this);
139 139
 
140
-	m_treeView = new KListView(this);
140
+	m_treeView = new TDEListView(this);
141 141
 	layout->addWidget(m_treeView);
142 142
 	m_treeView->addColumn("Tree");
143 143
 	m_treeView->header()->hide();

+ 2
- 2
bibletime/frontend/keychooser/cbooktreechooser.h View File

@@ -86,7 +86,7 @@ protected slots: // Protected slots
86 86
 	void itemActivated( TQListViewItem* item );
87 87
 
88 88
 private:
89
-class TreeItem : public KListViewItem {
89
+class TreeItem : public TDEListViewItem {
90 90
 public:
91 91
 		TreeItem(TQListViewItem* parent, TQListViewItem* after, CSwordTreeKey* key, const TQString keyName);
92 92
 		TreeItem(TQListViewItem* parent, CSwordTreeKey* key, const TQString keyName);
@@ -107,7 +107,7 @@ private:
107 107
 
108 108
 	TQPtrList<CSwordBookModuleInfo> m_modules;
109 109
 	CSwordTreeKey* m_key;
110
-	KListView* m_treeView;
110
+	TDEListView* m_treeView;
111 111
 };
112 112
 
113 113
 #endif

+ 5
- 5
bibletime/frontend/mainindex/cindexitem.cpp View File

@@ -53,12 +53,12 @@ using namespace Printing;
53 53
 using std::string;
54 54
 
55 55
 CItemBase::CItemBase(CMainIndex* mainIndex, const Type type)
56
-: KListViewItem(mainIndex),
56
+: TDEListViewItem(mainIndex),
57 57
 m_type(type),
58 58
 m_sortingEnabled(true) {}
59 59
 
60 60
 CItemBase::CItemBase(CItemBase* parentItem, const Type type)
61
-: KListViewItem(parentItem),
61
+: TDEListViewItem(parentItem),
62 62
 m_type(type),
63 63
 m_sortingEnabled(true) {}
64 64
 
@@ -122,7 +122,7 @@ void CItemBase::sortChildItems( int col, bool asc ) {
122 122
 		return;
123 123
 	}
124 124
 	else {
125
-		KListViewItem::sortChildItems( col, asc );