summaryrefslogtreecommitdiffstats
path: root/karm
diff options
context:
space:
mode:
Diffstat (limited to 'karm')
-rw-r--r--karm/TODO2
-rw-r--r--karm/csvexportdialog.h2
-rw-r--r--karm/csvexportdialog_base.ui4
-rw-r--r--karm/desktoptracker.cpp6
-rw-r--r--karm/desktoptracker.h2
-rw-r--r--karm/doc/Mainpage.dox18
-rw-r--r--karm/edittaskdialog.cpp8
-rw-r--r--karm/edittaskdialog.h2
-rw-r--r--karm/idletimedetector.cpp2
-rw-r--r--karm/idletimedetector.h2
-rw-r--r--karm/karm_part.cpp130
-rw-r--r--karm/karm_part.h4
-rw-r--r--karm/karmstorage.cpp4
-rw-r--r--karm/ktimewidget.cpp2
-rw-r--r--karm/mainwindow.cpp126
-rw-r--r--karm/mainwindow.h2
-rw-r--r--karm/preferences.cpp8
-rw-r--r--karm/preferences.h2
-rw-r--r--karm/printdialog.cpp2
-rw-r--r--karm/printdialog.h2
-rw-r--r--karm/task.cpp10
-rw-r--r--karm/task.h2
-rw-r--r--karm/taskview.cpp54
-rw-r--r--karm/taskview.h2
-rw-r--r--karm/tdeaccelmenuwatch.cpp2
-rw-r--r--karm/tdeaccelmenuwatch.h2
-rw-r--r--karm/test/script.cpp16
-rw-r--r--karm/test/script.h2
-rw-r--r--karm/tray.cpp4
-rw-r--r--karm/tray.h2
30 files changed, 213 insertions, 213 deletions
diff --git a/karm/TODO b/karm/TODO
index e9024454..3669fe3f 100644
--- a/karm/TODO
+++ b/karm/TODO
@@ -1,6 +1,6 @@
* KarmWindow::makeMenus -> export TDEAction? KarmWindow::contextMenuRequest
* QPopupMenu should be static! put connect( ..contextMenu at the right place
-* mainwindow: move tray Q_SIGNALS into tray.cpp add mouse double-click action
+* mainwindow: move tray signals into tray.cpp add mouse double-click action
* (start new timer, stop old) to "Configure
Shortcuts" dialog.
diff --git a/karm/csvexportdialog.h b/karm/csvexportdialog.h
index 08bebd9d..7e4a6028 100644
--- a/karm/csvexportdialog.h
+++ b/karm/csvexportdialog.h
@@ -26,7 +26,7 @@
class CSVExportDialog : public CSVExportDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/csvexportdialog_base.ui b/karm/csvexportdialog_base.ui
index 361ff510..091262c3 100644
--- a/karm/csvexportdialog_base.ui
+++ b/karm/csvexportdialog_base.ui
@@ -402,9 +402,9 @@
<tabstop>btnExport</tabstop>
<tabstop>btnCancel</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot>enableExportButton()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<includes>
<include location="global" impldecl="in implementation">kdateedit.h</include>
diff --git a/karm/desktoptracker.cpp b/karm/desktoptracker.cpp
index 06216570..cf41d5b3 100644
--- a/karm/desktoptracker.cpp
+++ b/karm/desktoptracker.cpp
@@ -11,8 +11,8 @@ const int minimumInterval = 5; // seconds
DesktopTracker::DesktopTracker ()
{
// Setup desktop change handling
- connect( &kWinModule, TQT_SIGNAL( currentDesktopChanged(int) ),
- this, TQT_SLOT( handleDesktopChange(int) ));
+ connect( &kWinModule, TQ_SIGNAL( currentDesktopChanged(int) ),
+ this, TQ_SLOT( handleDesktopChange(int) ));
_desktopCount = kWinModule.numberOfDesktops();
_previousDesktop = kWinModule.currentDesktop()-1;
@@ -21,7 +21,7 @@ DesktopTracker::DesktopTracker ()
if( _previousDesktop < 0 ) _previousDesktop = 0;
_timer = new TQTimer(this);
- connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( changeTimers() ) );
+ connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( changeTimers() ) );
}
void DesktopTracker::handleDesktopChange( int desktop )
diff --git a/karm/desktoptracker.h b/karm/desktoptracker.h
index 78bc7fb8..d02931bd 100644
--- a/karm/desktoptracker.h
+++ b/karm/desktoptracker.h
@@ -20,7 +20,7 @@ const int maxDesktops = 20;
class DesktopTracker: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/doc/Mainpage.dox b/karm/doc/Mainpage.dox
index 44aae4ee..b1228f32 100644
--- a/karm/doc/Mainpage.dox
+++ b/karm/doc/Mainpage.dox
@@ -24,7 +24,7 @@ order and can return a pointer to a KCal::Todo object that holds the same
information.
Preferences is a singleton that stores configuration options. It raises
-Q_SIGNALS when options change (for example, the location where the karm data is
+signals when options change (for example, the location where the karm data is
stored) so the application can react and adjust.
KarmStorage is a singleton that creates an interface for storing KArm data.
@@ -35,7 +35,7 @@ format.
/** \page sig_slot_index Index of Signals and Slots
-To get an understanding of the flow program, it may be useful to see an overview of all of the Q_SIGNALS, Q_SLOTS, and
+To get an understanding of the flow program, it may be useful to see an overview of all of the signals, slots, and
connections. See \see connections to get an index of what signal is connected to which slot.
\section overview Summary of what each class provides
@@ -60,9 +60,9 @@ connections. See \see connections to get an index of what signal is connected to
<tr><td>Task</td> <td>&nbsp;</td> <td>&nbsp;</td> <td>Y </td> <td>&nbsp;</td></tr>
</table>
-\section Q_SIGNALS Listing of all of the Q_SIGNALS
+\section signals Listing of all of the signals
-These are the Q_SIGNALS:
+These are the signals:
<ol>
<li>IdleTimer::extractTime(int)
<li>IdleTimer::stopTimer()
@@ -76,14 +76,14 @@ These are the Q_SIGNALS:
<li>Preferences::autoSavePeriod(int)
<li>Preferences::detectIdleness(bool)
<li>Preferences::idlenessTimeout(int)
- <li>Preferences::saveFile(QString)
+ <li>Preferences::saveFile(TQString)
<li>Preferences::setupChanged()
- <li>Preferences::timeLog(QString)
+ <li>Preferences::timeLog(TQString)
<li>Preferences::timeLoging(bool)
<li>Preferences::hideOnClose(bool)
</ol>
-\section Q_SLOTS Listing of the Q_SLOTS
+\section slots Listing of the slots
\subsection public Public Slots
@@ -100,8 +100,8 @@ These are the Q_SIGNALS:
<li>Karm::load()
<li>Karm::newSubTask()
<li>Karm::newTask()
- <li>Karm::newTask(QString, QListViewItem*)
- <li>Karm::parseLine(QString, long*, QString*, int*)
+ <li>Karm::newTask(TQString, QListViewItem*)
+ <li>Karm::parseLine(TQString, long*, TQString*, int*)
<li>Karm::resetSessionTimeForAllTasks()
<li>Karm::save()
<li>Karm::startTimer()
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index 3f18faa1..37d215d5 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -72,7 +72,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
_absoluteRB = new TQRadioButton( i18n( "Edit &absolute" ), page,
"_absoluteRB" );
lay1->addWidget( _absoluteRB );
- connect( _absoluteRB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbsolutePressed() ) );
+ connect( _absoluteRB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAbsolutePressed() ) );
// Absolute times
@@ -124,7 +124,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
_relativeRB = new TQRadioButton( i18n( "Edit &relative (apply to both time and"
" session time)" ), page, "_relativeRB" );
lay1->addWidget( _relativeRB );
- connect( _relativeRB, TQT_SIGNAL( clicked() ), this, TQT_SLOT(slotRelativePressed()) );
+ connect( _relativeRB, TQ_SIGNAL( clicked() ), this, TQ_SLOT(slotRelativePressed()) );
// The relative times
TQHBoxLayout *lay4 = new TQHBoxLayout();
@@ -173,7 +173,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
{
int lines = (int)(desktopCount/2);
if (lines*2 != desktopCount) lines++;
- groupBox = new TQButtonGroup( lines, Qt::Horizontal,
+ groupBox = new TQButtonGroup( lines, TQt::Horizontal,
i18n("In Desktop"), page, "_desktopsGB");
}
lay1->addWidget(groupBox);
@@ -207,7 +207,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg,
for (int i=0; i<desktopCount; i++)
_deskBox[i]->setEnabled(enableDesktops);
- connect(_desktopCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAutoTrackingPressed()));
+ connect(_desktopCB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAutoTrackingPressed()));
lay1->addStretch(1);
diff --git a/karm/edittaskdialog.h b/karm/edittaskdialog.h
index f913c978..cd173d33 100644
--- a/karm/edittaskdialog.h
+++ b/karm/edittaskdialog.h
@@ -42,7 +42,7 @@ class KArmTimeWidget;
class EditTaskDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp
index 110eacd0..bf4092f5 100644
--- a/karm/idletimedetector.cpp
+++ b/karm/idletimedetector.cpp
@@ -27,7 +27,7 @@ IdleTimeDetector::IdleTimeDetector(int maxIdle)
}
_timer = new TQTimer(this);
- connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(check()));
+ connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(check()));
#else
_idleDetectionPossible = false;
#endif // HAVE_LIBXSS
diff --git a/karm/idletimedetector.h b/karm/idletimedetector.h
index 1b0b4497..b5645431 100644
--- a/karm/idletimedetector.h
+++ b/karm/idletimedetector.h
@@ -27,7 +27,7 @@ const int testInterval= secsPerMinute * 1000;
class IdleTimeDetector :public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index d1d6e509..25531967 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -25,7 +25,7 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name )
: DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name),
_accel ( new TDEAccel( parentWidget ) ),
- _watcher ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(parentWidget) ) )
+ _watcher ( new TDEAccelMenuWatch( _accel, parentWidget ) )
{
// we need an instance
setInstance( karmPartFactory::instance() );
@@ -40,9 +40,9 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
setWidget(_taskView);
// create our actions
- KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
- KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
- KStdAction::save(this, TQT_SLOT(save()), actionCollection());
+ KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+ KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
+ KStdAction::save(this, TQ_SLOT(save()), actionCollection());
makeMenus();
@@ -50,29 +50,29 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
// connections
- connect( _taskView, TQT_SIGNAL( totalTimesChanged( long, long ) ),
- this, TQT_SLOT( updateTime( long, long ) ) );
- connect( _taskView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )),
- this, TQT_SLOT(slotSelectionChanged()));
- connect( _taskView, TQT_SIGNAL( updateButtons() ),
- this, TQT_SLOT(slotSelectionChanged()));
+ connect( _taskView, TQ_SIGNAL( totalTimesChanged( long, long ) ),
+ this, TQ_SLOT( updateTime( long, long ) ) );
+ connect( _taskView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )),
+ this, TQ_SLOT(slotSelectionChanged()));
+ connect( _taskView, TQ_SIGNAL( updateButtons() ),
+ this, TQ_SLOT(slotSelectionChanged()));
// Setup context menu request handling
connect( _taskView,
- TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
+ TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
this,
- TQT_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int )));
+ TQ_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int )));
_tray = new KarmTray( this );
- connect( _tray, TQT_SIGNAL( quitSelected() ), TQT_SLOT( quit() ) );
+ connect( _tray, TQ_SIGNAL( quitSelected() ), TQ_SLOT( quit() ) );
- connect( _taskView, TQT_SIGNAL( timersActive() ), _tray, TQT_SLOT( startClock() ) );
- connect( _taskView, TQT_SIGNAL( timersActive() ), this, TQT_SLOT( enableStopAll() ));
- connect( _taskView, TQT_SIGNAL( timersInactive() ), _tray, TQT_SLOT( stopClock() ) );
- connect( _taskView, TQT_SIGNAL( timersInactive() ), this, TQT_SLOT( disableStopAll()));
- connect( _taskView, TQT_SIGNAL( tasksChanged( TQPtrList<Task> ) ),
- _tray, TQT_SLOT( updateToolTip( TQPtrList<Task> ) ));
+ connect( _taskView, TQ_SIGNAL( timersActive() ), _tray, TQ_SLOT( startClock() ) );
+ connect( _taskView, TQ_SIGNAL( timersActive() ), this, TQ_SLOT( enableStopAll() ));
+ connect( _taskView, TQ_SIGNAL( timersInactive() ), _tray, TQ_SLOT( stopClock() ) );
+ connect( _taskView, TQ_SIGNAL( timersInactive() ), this, TQ_SLOT( disableStopAll()));
+ connect( _taskView, TQ_SIGNAL( tasksChanged( TQPtrList<Task> ) ),
+ _tray, TQ_SLOT( updateToolTip( TQPtrList<Task> ) ));
_taskView->load();
@@ -113,119 +113,119 @@ void karmPart::makeMenus()
*actionNew,
*actionNewSub;
- (void) KStdAction::quit( this, TQT_SLOT( quit() ), actionCollection());
- (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection());
- actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
+ (void) KStdAction::quit( this, TQ_SLOT( quit() ), actionCollection());
+ (void) KStdAction::print( this, TQ_SLOT( print() ), actionCollection());
+ actionKeyBindings = KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ),
actionCollection() );
- actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences),
- TQT_SLOT(showDialog()),
+ actionPreferences = KStdAction::preferences(_preferences,
+ TQ_SLOT(showDialog()),
actionCollection() );
- (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() );
+ (void) KStdAction::save( this, TQ_SLOT( save() ), actionCollection() );
TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"),
0,
- TQT_TQOBJECT(this),
- TQT_SLOT( startNewSession() ),
+ this,
+ TQ_SLOT( startNewSession() ),
actionCollection(),
"start_new_session");
TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"),
0,
- TQT_TQOBJECT(this),
- TQT_SLOT( resetAllTimes() ),
+ this,
+ TQ_SLOT( resetAllTimes() ),
actionCollection(),
"reset_all_times");
actionStart = new TDEAction( i18n("&Start"),
TQString::fromLatin1("1rightarrow"), Key_S,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( startCurrentTimer() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( startCurrentTimer() ), actionCollection(),
"start");
actionStop = new TDEAction( i18n("S&top"),
TQString::fromLatin1("process-stop"), 0,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( stopCurrentTimer() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( stopCurrentTimer() ), actionCollection(),
"stop");
actionStopAll = new TDEAction( i18n("Stop &All Timers"),
Key_Escape,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( stopAllTimers() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( stopAllTimers() ), actionCollection(),
"stopAll");
actionStopAll->setEnabled(false);
actionNew = new TDEAction( i18n("&New..."),
TQString::fromLatin1("document-new"), CTRL+Key_N,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( newTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new TDEAction( i18n("New &Subtask..."),
TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( newSubTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");
actionDelete = new TDEAction( i18n("&Delete"),
TQString::fromLatin1("edit-delete"), Key_Delete,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( deleteTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( deleteTask() ), actionCollection(),
"delete_task");
actionEdit = new TDEAction( i18n("&Edit..."),
TQString::fromLatin1("edit"), CTRL + Key_E,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( editTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( editTask() ), actionCollection(),
"edit_task");
// actionAddComment = new TDEAction( i18n("&Add Comment..."),
// TQString::fromLatin1("text-x-generic"),
// CTRL+ALT+Key_E,
-// TQT_TQOBJECT(_taskView),
-// TQT_SLOT( addCommentToTask() ),
+// _taskView,
+// TQ_SLOT( addCommentToTask() ),
// actionCollection(),
// "add_comment_to_task");
actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
TQString::fromLatin1("text-x-generic"),
CTRL+Key_M,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( markTaskAsComplete() ),
+ _taskView,
+ TQ_SLOT( markTaskAsComplete() ),
actionCollection(),
"mark_as_complete");
actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
TQString::fromLatin1("text-x-generic"),
CTRL+Key_M,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( markTaskAsIncomplete() ),
+ _taskView,
+ TQ_SLOT( markTaskAsIncomplete() ),
actionCollection(),
"mark_as_incomplete");
actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"),
TQString::fromLatin1("klipper"),
CTRL+Key_C,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( clipTotals() ),
+ _taskView,
+ TQ_SLOT( clipTotals() ),
actionCollection(),
"clip_totals");
actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"),
TQString::fromLatin1("klipper"),
CTRL+ALT+Key_C,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( clipHistory() ),
+ _taskView,
+ TQ_SLOT( clipHistory() ),
actionCollection(),
"clip_history");
new TDEAction( i18n("Import &Legacy Flat File..."), 0,
- TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(),
+ _taskView, TQ_SLOT(loadFromFlatFile()), actionCollection(),
"import_flatfile");
new TDEAction( i18n("&Export to CSV File..."), 0,
- TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(),
+ _taskView, TQ_SLOT(exportcsvFile()), actionCollection(),
"export_csvfile");
new TDEAction( i18n("Export &History to CSV File..."), 0,
- TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(),
+ this, TQ_SLOT(exportcsvHistory()), actionCollection(),
"export_csvhistory");
new TDEAction( i18n("Import Tasks From &Planner..."), 0,
- TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(),
+ _taskView, TQ_SLOT(importPlanner()), actionCollection(),
"import_planner");
new TDEAction( i18n("Configure KArm..."), 0,
- TQT_TQOBJECT(_preferences), TQT_SLOT(showDialog()), actionCollection(),
+ _preferences, TQ_SLOT(showDialog()), actionCollection(),
"configure_karm");
/*
new TDEAction( i18n("Import E&vents"), 0,
_taskView,
- TQT_SLOT( loadFromKOrgEvents() ), actionCollection(),
+ TQ_SLOT( loadFromKOrgEvents() ), actionCollection(),
"import_korg_events");
*/
@@ -287,12 +287,12 @@ void karmPart::setReadWrite(bool rw)
{
// notify your internal widget of the read-write state
if (rw)
- connect(_taskView, TQT_SIGNAL(textChanged()),
- this, TQT_SLOT(setModified()));
+ connect(_taskView, TQ_SIGNAL(textChanged()),
+ this, TQ_SLOT(setModified()));
else
{
- disconnect(_taskView, TQT_SIGNAL(textChanged()),
- this, TQT_SLOT(setModified()));
+ disconnect(_taskView, TQ_SIGNAL(textChanged()),
+ this, TQ_SLOT(setModified()));
}
ReadWritePart::setReadWrite(rw);
@@ -544,10 +544,10 @@ int karmPart::bookTime
// Parse datetime
if ( !rval )
{
- startDate = TQDate::fromString( datetime, Qt::ISODate );
+ startDate = TQDate::fromString( datetime, TQt::ISODate );
if ( datetime.length() > 10 ) // "YYYY-MM-DD".length() = 10
{
- startTime = TQTime::fromString( datetime, Qt::ISODate );
+ startTime = TQTime::fromString( datetime, TQt::ISODate );
}
else startTime = TQTime( 12, 0 );
if ( startDate.isValid() && startTime.isValid() )
diff --git a/karm/karm_part.h b/karm/karm_part.h
index 22a63cff..d4d50209 100644
--- a/karm/karm_part.h
+++ b/karm/karm_part.h
@@ -29,7 +29,7 @@ class TaskView;
*/
class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface
{
- Q_OBJECT
+ TQ_OBJECT
private:
@@ -121,7 +121,7 @@ class TDEAboutData;
class karmPartFactory : public KParts::Factory
{
- Q_OBJECT
+ TQ_OBJECT
public:
karmPartFactory();
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 1992c0f8..92f69ff6 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -132,8 +132,8 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt
}
_calendar = resource;
- TQObject::connect (_calendar, TQT_SIGNAL(resourceChanged(ResourceCalendar *)),
- view, TQT_SLOT(iCalFileModified(ResourceCalendar *)));
+ TQObject::connect (_calendar, TQ_SIGNAL(resourceChanged(ResourceCalendar *)),
+ view, TQ_SLOT(iCalFileModified(ResourceCalendar *)));
_calendar->setTimeZoneId( KPimPrefs::timezone() );
_calendar->setResourceName( TQString::fromLatin1("KArm") );
_calendar->open();
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp
index fb18e8be..ecf632a7 100644
--- a/karm/ktimewidget.cpp
+++ b/karm/ktimewidget.cpp
@@ -17,7 +17,7 @@ class TimeValidator : public TQValidator
{
public:
TimeValidator( ValidatorType tp, TQWidget *parent=0, const char *name=0)
- : TQValidator(TQT_TQOBJECT(parent), name)
+ : TQValidator(parent, name)
{
_tp = tp;
}
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 9c892f18..6edc6b2d 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -38,7 +38,7 @@ MainWindow::MainWindow( const TQString &icsfile )
: DCOPObject ( "KarmDCOPIface" ),
KParts::MainWindow(0,TQt::WStyle_ContextHelp),
_accel ( new TDEAccel( this ) ),
- _watcher ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(this) ) ),
+ _watcher ( new TDEAccelMenuWatch( _accel, this ) ),
_totalSum ( 0 ),
_sessionSum( 0 )
{
@@ -57,33 +57,33 @@ MainWindow::MainWindow( const TQString &icsfile )
_watcher->updateMenus();
// connections
- connect( _taskView, TQT_SIGNAL( totalTimesChanged( long, long ) ),
- this, TQT_SLOT( updateTime( long, long ) ) );
- connect( _taskView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )),
- this, TQT_SLOT(slotSelectionChanged()));
- connect( _taskView, TQT_SIGNAL( updateButtons() ),
- this, TQT_SLOT(slotSelectionChanged()));
- connect( _taskView, TQT_SIGNAL( setStatusBar( TQString ) ),
- this, TQT_SLOT(setStatusBar( TQString )));
+ connect( _taskView, TQ_SIGNAL( totalTimesChanged( long, long ) ),
+ this, TQ_SLOT( updateTime( long, long ) ) );
+ connect( _taskView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )),
+ this, TQ_SLOT(slotSelectionChanged()));
+ connect( _taskView, TQ_SIGNAL( updateButtons() ),
+ this, TQ_SLOT(slotSelectionChanged()));
+ connect( _taskView, TQ_SIGNAL( setStatusBar( TQString ) ),
+ this, TQ_SLOT(setStatusBar( TQString )));
loadGeometry();
// Setup context menu request handling
connect( _taskView,
- TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
+ TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )),
this,
- TQT_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int )));
+ TQ_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int )));
_tray = new KarmTray( this );
- connect( _tray, TQT_SIGNAL( quitSelected() ), TQT_SLOT( quit() ) );
+ connect( _tray, TQ_SIGNAL( quitSelected() ), TQ_SLOT( quit() ) );
- connect( _taskView, TQT_SIGNAL( timersActive() ), _tray, TQT_SLOT( startClock() ) );
- connect( _taskView, TQT_SIGNAL( timersActive() ), this, TQT_SLOT( enableStopAll() ));
- connect( _taskView, TQT_SIGNAL( timersInactive() ), _tray, TQT_SLOT( stopClock() ) );
- connect( _taskView, TQT_SIGNAL( timersInactive() ), this, TQT_SLOT( disableStopAll()));
- connect( _taskView, TQT_SIGNAL( tasksChanged( TQPtrList<Task> ) ),
- _tray, TQT_SLOT( updateToolTip( TQPtrList<Task> ) ));
+ connect( _taskView, TQ_SIGNAL( timersActive() ), _tray, TQ_SLOT( startClock() ) );
+ connect( _taskView, TQ_SIGNAL( timersActive() ), this, TQ_SLOT( enableStopAll() ));
+ connect( _taskView, TQ_SIGNAL( timersInactive() ), _tray, TQ_SLOT( stopClock() ) );
+ connect( _taskView, TQ_SIGNAL( timersInactive() ), this, TQ_SLOT( disableStopAll()));
+ connect( _taskView, TQ_SIGNAL( tasksChanged( TQPtrList<Task> ) ),
+ _tray, TQ_SLOT( updateToolTip( TQPtrList<Task> ) ));
_taskView->load();
@@ -251,124 +251,124 @@ void MainWindow::makeMenus()
*actionNew,
*actionNewSub;
- (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( quit() ), actionCollection());
- (void) KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection());
- actionKeyBindings = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ),
+ (void) KStdAction::quit( this, TQ_SLOT( quit() ), actionCollection());
+ (void) KStdAction::print( this, TQ_SLOT( print() ), actionCollection());
+ actionKeyBindings = KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ),
actionCollection() );
- actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences),
- TQT_SLOT(showDialog()),
+ actionPreferences = KStdAction::preferences(_preferences,
+ TQ_SLOT(showDialog()),
actionCollection() );
- (void) KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection() );
+ (void) KStdAction::save( this, TQ_SLOT( save() ), actionCollection() );
TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"),
0,
- TQT_TQOBJECT(this),
- TQT_SLOT( startNewSession() ),
+ this,
+ TQ_SLOT( startNewSession() ),
actionCollection(),
"start_new_session");
TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"),
0,
- TQT_TQOBJECT(this),
- TQT_SLOT( resetAllTimes() ),
+ this,
+ TQ_SLOT( resetAllTimes() ),
actionCollection(),
"reset_all_times");
actionStart = new TDEAction( i18n("&Start"),
TQString::fromLatin1("1rightarrow"), Key_S,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( startCurrentTimer() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( startCurrentTimer() ), actionCollection(),
"start");
actionStop = new TDEAction( i18n("S&top"),
TQString::fromLatin1("process-stop"), Key_S,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( stopCurrentTimer() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( stopCurrentTimer() ), actionCollection(),
"stop");
actionStopAll = new TDEAction( i18n("Stop &All Timers"),
Key_Escape,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( stopAllTimers() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( stopAllTimers() ), actionCollection(),
"stopAll");
actionStopAll->setEnabled(false);
actionNew = new TDEAction( i18n("&New..."),
TQString::fromLatin1("document-new"), CTRL+Key_N,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( newTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( newTask() ), actionCollection(),
"new_task");
actionNewSub = new TDEAction( i18n("New &Subtask..."),
TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( newSubTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( newSubTask() ), actionCollection(),
"new_sub_task");
actionDelete = new TDEAction( i18n("&Delete"),
TQString::fromLatin1("edit-delete"), Key_Delete,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( deleteTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( deleteTask() ), actionCollection(),
"delete_task");
actionEdit = new TDEAction( i18n("&Edit..."),
TQString::fromLatin1("edit"), CTRL + Key_E,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( editTask() ), actionCollection(),
+ _taskView,
+ TQ_SLOT( editTask() ), actionCollection(),
"edit_task");
// actionAddComment = new TDEAction( i18n("&Add Comment..."),
// TQString::fromLatin1("text-x-generic"),
// CTRL+ALT+Key_E,
-// TQT_TQOBJECT(_taskView),
-// TQT_SLOT( addCommentToTask() ),
+// _taskView,
+// TQ_SLOT( addCommentToTask() ),
// actionCollection(),
// "add_comment_to_task");
actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
TQString::fromLatin1("text-x-generic"),
CTRL+Key_M,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( markTaskAsComplete() ),
+ _taskView,
+ TQ_SLOT( markTaskAsComplete() ),
actionCollection(),
"mark_as_complete");
actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
TQString::fromLatin1("text-x-generic"),
CTRL+Key_M,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( markTaskAsIncomplete() ),
+ _taskView,
+ TQ_SLOT( markTaskAsIncomplete() ),
actionCollection(),
"mark_as_incomplete");
actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"),
TQString::fromLatin1("klipper"),
CTRL+Key_C,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( clipTotals() ),
+ _taskView,
+ TQ_SLOT( clipTotals() ),
actionCollection(),
"clip_totals");
// actionClipTotals will never be used again, overwrite it
actionClipTotals = new TDEAction( i18n("&Copy Session Time to Clipboard"),
TQString::fromLatin1("klipper"),
0,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( clipSession() ),
+ _taskView,
+ TQ_SLOT( clipSession() ),
actionCollection(),
"clip_session");
actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"),
TQString::fromLatin1("klipper"),
CTRL+ALT+Key_C,
- TQT_TQOBJECT(_taskView),
- TQT_SLOT( clipHistory() ),
+ _taskView,
+ TQ_SLOT( clipHistory() ),
actionCollection(),
"clip_history");
new TDEAction( i18n("Import &Legacy Flat File..."), 0,
- TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(),
+ _taskView, TQ_SLOT(loadFromFlatFile()), actionCollection(),
"import_flatfile");
new TDEAction( i18n("&Export to CSV File..."), 0,
- TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(),
+ _taskView, TQ_SLOT(exportcsvFile()), actionCollection(),
"export_csvfile");
new TDEAction( i18n("Export &History to CSV File..."), 0,
- TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(),
+ this, TQ_SLOT(exportcsvHistory()), actionCollection(),
"export_csvhistory");
new TDEAction( i18n("Import Tasks From &Planner..."), 0,
- TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(),
+ _taskView, TQ_SLOT(importPlanner()), actionCollection(),
"import_planner");
/*
new TDEAction( i18n("Import E&vents"), 0,
_taskView,
- TQT_SLOT( loadFromKOrgEvents() ), actionCollection(),
+ TQ_SLOT( loadFromKOrgEvents() ), actionCollection(),
"import_korg_events");
*/
@@ -578,10 +578,10 @@ int MainWindow::bookTime
// Parse datetime
if ( !rval )
{
- startDate = TQDate::fromString( datetime, Qt::ISODate );
+ startDate = TQDate::fromString( datetime, TQt::ISODate );
if ( datetime.length() > 10 ) // "YYYY-MM-DD".length() = 10
{
- startTime = TQTime::fromString( datetime, Qt::ISODate );
+ startTime = TQTime::fromString( datetime, TQt::ISODate );
}
else startTime = TQTime( 12, 0 );
if ( startDate.isValid() && startTime.isValid() )
@@ -718,10 +718,10 @@ TQString MainWindow::exportcsvfile( TQString filename, TQString from, TQString t
ReportCriteria rc;
rc.url=filename;
rc.from=TQDate::fromString( from );
- if ( rc.from.isNull() ) rc.from=TQDate::fromString( from, Qt::ISODate );
+ if ( rc.from.isNull() ) rc.from=TQDate::fromString( from, TQt::ISODate );
kdDebug(5970) << "rc.from " << rc.from << endl;
rc.to=TQDate::fromString( to );
- if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, Qt::ISODate );
+ if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, TQt::ISODate );
kdDebug(5970) << "rc.to " << rc.to << endl;
rc.reportType=(ReportCriteria::REPORTTYPE) type; // history report or totals report
rc.decimalMinutes=decimalMinutes;
diff --git a/karm/mainwindow.h b/karm/mainwindow.h
index 0e932484..7d055802 100644
--- a/karm/mainwindow.h
+++ b/karm/mainwindow.h
@@ -25,7 +25,7 @@ class TaskView;
class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface
{
- Q_OBJECT
+ TQ_OBJECT
private:
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index 29b242cf..e8a437ef 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -68,8 +68,8 @@ void Preferences::makeBehaviorPage()
topLevel->addStretch();
- connect( _doIdleDetectionW, TQT_SIGNAL( clicked() ), this,
- TQT_SLOT( idleDetectCheckBoxChanged() ));
+ connect( _doIdleDetectionW, TQ_SIGNAL( clicked() ), this,
+ TQ_SLOT( idleDetectCheckBoxChanged() ));
}
void Preferences::makeDisplayPage()
@@ -138,8 +138,8 @@ void Preferences::makeStoragePage()
topLevel->addStretch();
// checkboxes disable file selection controls
- connect( _doAutoSaveW, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( autoSaveCheckBoxChanged() ));
+ connect( _doAutoSaveW, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( autoSaveCheckBoxChanged() ));
}
void Preferences::disableIdleDetection()
diff --git a/karm/preferences.h b/karm/preferences.h
index 8ac92fed..51b52640 100644
--- a/karm/preferences.h
+++ b/karm/preferences.h
@@ -15,7 +15,7 @@ class KURLRequester;
class Preferences :public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp
index 9b4e3b78..128c892a 100644
--- a/karm/printdialog.cpp
+++ b/karm/printdialog.cpp
@@ -53,7 +53,7 @@ PrintDialog::PrintDialog()
layout->addStretch(1);
// Date Range
- TQGroupBox *rangeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Date Range"),
+ TQGroupBox *rangeGroup = new TQGroupBox(1, TQt::Horizontal, i18n("Date Range"),
page);
layout->addWidget(rangeGroup);
diff --git a/karm/printdialog.h b/karm/printdialog.h
index 18eb2695..d5316f8a 100644
--- a/karm/printdialog.h
+++ b/karm/printdialog.h
@@ -30,7 +30,7 @@ class KDateEdit;
class PrintDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/task.cpp b/karm/task.cpp
index 5b05407d..88c0e099 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -54,11 +54,11 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime,
// If our parent is the taskview then connect our totalTimesChanged
// signal to its receiver
if ( ! parent() )
- connect( this, TQT_SIGNAL( totalTimesChanged ( long, long ) ),
- listView(), TQT_SLOT( taskTotalTimesChanged( long, long) ));
+ connect( this, TQ_SIGNAL( totalTimesChanged ( long, long ) ),
+ listView(), TQ_SLOT( taskTotalTimesChanged( long, long) ));
- connect( this, TQT_SIGNAL( deletingTask( Task* ) ),
- listView(), TQT_SLOT( deletingTask( Task* ) ));
+ connect( this, TQ_SIGNAL( deletingTask( Task* ) ),
+ listView(), TQ_SLOT( deletingTask( Task* ) ));
if (icons == 0) {
icons = new TQPtrVector<TQPixmap>(8);
@@ -80,7 +80,7 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime,
_totalSessionTime = _sessionTime = sessionTime;
_timer = new TQTimer(this);
_desktops = desktops;
- connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateActiveIcon()));
+ connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateActiveIcon()));
setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm")));
_currentPic = 0;
_percentcomplete = percent_complete;
diff --git a/karm/task.h b/karm/task.h
index f375e271..97cc6109 100644
--- a/karm/task.h
+++ b/karm/task.h
@@ -40,7 +40,7 @@ class TQPixmap;
*/
class Task : public TQObject, public TQListViewItem
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index 796e46d2..ad0877f1 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -42,10 +42,10 @@ TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile )
_preferences = Preferences::instance( icsfile );
_storage = KarmStorage::instance();
- connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ),
- this, TQT_SLOT( itemStateChanged( TQListViewItem * ) ) );
- connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ),
- this, TQT_SLOT( itemStateChanged( TQListViewItem * ) ) );
+ connect( this, TQ_SIGNAL( expanded( TQListViewItem * ) ),
+ this, TQ_SLOT( itemStateChanged( TQListViewItem * ) ) );
+ connect( this, TQ_SIGNAL( collapsed( TQListViewItem * ) ),
+ this, TQ_SLOT( itemStateChanged( TQListViewItem * ) ) );
// setup default values
previousColumnWidths[0] = previousColumnWidths[1]
@@ -65,49 +65,49 @@ TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile )
// set up the minuteTimer
_minuteTimer = new TQTimer(this);
- connect( _minuteTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( minuteUpdate() ));
+ connect( _minuteTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( minuteUpdate() ));
_minuteTimer->start(1000 * secsPerMinute);
// React when user changes iCalFile
- connect(_preferences, TQT_SIGNAL(iCalFile(TQString)),
- this, TQT_SLOT(iCalFileChanged(TQString)));
+ connect(_preferences, TQ_SIGNAL(iCalFile(TQString)),
+ this, TQ_SLOT(iCalFileChanged(TQString)));
// resize columns when config is changed
- connect(_preferences, TQT_SIGNAL( setupChanged() ), this,TQT_SLOT( adaptColumns() ));
+ connect(_preferences, TQ_SIGNAL( setupChanged() ), this,TQ_SLOT( adaptColumns() ));
_minuteTimer->start(1000 * secsPerMinute);
// Set up the idle detection.
_idleTimeDetector = new IdleTimeDetector( _preferences->idlenessTimeout() );
- connect( _idleTimeDetector, TQT_SIGNAL( extractTime(int) ),
- this, TQT_SLOT( extractTime(int) ));
- connect( _idleTimeDetector, TQT_SIGNAL( stopAllTimersAt(TQDateTime) ),
- this, TQT_SLOT( stopAllTimersAt(TQDateTime) ));
- connect( _preferences, TQT_SIGNAL( idlenessTimeout(int) ),
- _idleTimeDetector, TQT_SLOT( setMaxIdle(int) ));
- connect( _preferences, TQT_SIGNAL( detectIdleness(bool) ),
- _idleTimeDetector, TQT_SLOT( toggleOverAllIdleDetection(bool) ));
+ connect( _idleTimeDetector, TQ_SIGNAL( extractTime(int) ),
+ this, TQ_SLOT( extractTime(int) ));
+ connect( _idleTimeDetector, TQ_SIGNAL( stopAllTimersAt(TQDateTime) ),
+ this, TQ_SLOT( stopAllTimersAt(TQDateTime) ));
+ connect( _preferences, TQ_SIGNAL( idlenessTimeout(int) ),
+ _idleTimeDetector, TQ_SLOT( setMaxIdle(int) ));
+ connect( _preferences, TQ_SIGNAL( detectIdleness(bool) ),
+ _idleTimeDetector, TQ_SLOT( toggleOverAllIdleDetection(bool) ));
if (!_idleTimeDetector->isIdleDetectionPossible())
_preferences->disableIdleDetection();
// Setup auto save timer
_autoSaveTimer = new TQTimer(this);
- connect( _preferences, TQT_SIGNAL( autoSave(bool) ),
- this, TQT_SLOT( autoSaveChanged(bool) ));
- connect( _preferences, TQT_SIGNAL( autoSavePeriod(int) ),
- this, TQT_SLOT( autoSavePeriodChanged(int) ));
- connect( _autoSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( save() ));
+ connect( _preferences, TQ_SIGNAL( autoSave(bool) ),
+ this, TQ_SLOT( autoSaveChanged(bool) ));
+ connect( _preferences, TQ_SIGNAL( autoSavePeriod(int) ),
+ this, TQ_SLOT( autoSavePeriodChanged(int) ));
+ connect( _autoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( save() ));
// Setup manual save timer (to save changes a little while after they happen)
_manualSaveTimer = new TQTimer(this);
- connect( _manualSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( save() ));
+ connect( _manualSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( save() ));
// Connect desktop tracker events to task starting/stopping
_desktopTracker = new DesktopTracker();
- connect( _desktopTracker, TQT_SIGNAL( reachedtActiveDesktop( Task* ) ),
- this, TQT_SLOT( startTimerFor(Task*) ));
- connect( _desktopTracker, TQT_SIGNAL( leftActiveDesktop( Task* ) ),
- this, TQT_SLOT( stopTimerFor(Task*) ));
+ connect( _desktopTracker, TQ_SIGNAL( reachedtActiveDesktop( Task* ) ),
+ this, TQ_SLOT( startTimerFor(Task*) ));
+ connect( _desktopTracker, TQ_SIGNAL( leftActiveDesktop( Task* ) ),
+ this, TQ_SLOT( stopTimerFor(Task*) ));
new TaskViewWhatsThis( this );
}
@@ -131,7 +131,7 @@ void TaskView::contentsMousePressEvent ( TQMouseEvent * e )
int leftborder = treeStepSize() * ( task->depth() + ( rootIsDecorated() ? 1 : 0)) + itemMargin();
if ((leftborder < e->x()) && (e->x() < 19 + leftborder ))
{
- if ( e->button() == Qt::LeftButton )
+ if ( e->button() == TQt::LeftButton )
if ( task->isComplete() ) task->setPercentComplete( 0, _storage );
else task->setPercentComplete( 100, _storage );
}
diff --git a/karm/taskview.h b/karm/taskview.h
index cbb5def7..c74f86cf 100644
--- a/karm/taskview.h
+++ b/karm/taskview.h
@@ -41,7 +41,7 @@ using namespace KCal;
class TaskView : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/karm/tdeaccelmenuwatch.cpp b/karm/tdeaccelmenuwatch.cpp
index 5cb22366..3cc72ea8 100644
--- a/karm/tdeaccelmenuwatch.cpp
+++ b/karm/tdeaccelmenuwatch.cpp
@@ -27,7 +27,7 @@ void TDEAccelMenuWatch::setMenu( TQPopupMenu *menu )
if ( !_menuList.findRef( menu ) ) {
_menuList.append( menu );
- connect( menu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(removeDeadMenu()) );
+ connect( menu, TQ_SIGNAL(destroyed()), this, TQ_SLOT(removeDeadMenu()) );
}
_menu = menu;
diff --git a/karm/tdeaccelmenuwatch.h b/karm/tdeaccelmenuwatch.h
index 89f96d94..c9e8aae6 100644
--- a/karm/tdeaccelmenuwatch.h
+++ b/karm/tdeaccelmenuwatch.h
@@ -34,7 +34,7 @@ class TQPopupMenu;
class TDEAccelMenuWatch : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
private:
diff --git a/karm/test/script.cpp b/karm/test/script.cpp
index f9fa9d9e..ab6f7579 100644
--- a/karm/test/script.cpp
+++ b/karm/test/script.cpp
@@ -47,14 +47,14 @@ Script::Script( const TQDir& workingDirectory )
m_proc = new TQProcess( this );
m_proc->setWorkingDirectory( workingDirectory );
- connect ( m_proc, TQT_SIGNAL( readyReadStdout() ),
- this , TQT_SLOT ( stdout() )
+ connect ( m_proc, TQ_SIGNAL( readyReadStdout() ),
+ this , TQ_SLOT ( stdout() )
);
- connect ( m_proc, TQT_SIGNAL( readyReadStderr() ),
- this , TQT_SLOT ( stderr() )
+ connect ( m_proc, TQ_SIGNAL( readyReadStderr() ),
+ this , TQ_SLOT ( stderr() )
);
- connect ( m_proc, TQT_SIGNAL( processExited() ),
- this , TQT_SLOT ( exit() )
+ connect ( m_proc, TQ_SIGNAL( processExited() ),
+ this , TQ_SLOT ( exit() )
);
}
@@ -79,7 +79,7 @@ int Script::run()
{
m_proc->start();
// This didn't work. But Ctrl-C does. :P
- //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQT_SLOT( kill() ) );
+ //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQ_SLOT( kill() ) );
//while ( ! m_proc->normalExit() );
while ( m_proc->isRunning() );
return m_status;
@@ -89,7 +89,7 @@ void Script::terminate()
{
// These both trigger processExited, so exit() will run.
m_proc->tryTerminate();
- TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQT_SLOT( kill() ) );
+ TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQ_SLOT( kill() ) );
}
void Script::exit()
diff --git a/karm/test/script.h b/karm/test/script.h
index 3aad9c87..89d2d3f7 100644
--- a/karm/test/script.h
+++ b/karm/test/script.h
@@ -30,7 +30,7 @@ class TQStringList;
class Script : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Script( const TQDir& workingDirectory );
diff --git a/karm/tray.cpp b/karm/tray.cpp
index 5187c7e4..9332d1e0 100644
--- a/karm/tray.cpp
+++ b/karm/tray.cpp
@@ -35,8 +35,8 @@ KarmTray::KarmTray(MainWindow* parent)
{
// the timer that updates the "running" icon in the tray
_taskActiveTimer = new TQTimer(this);
- connect( _taskActiveTimer, TQT_SIGNAL( timeout() ), this,
- TQT_SLOT( advanceClock()) );
+ connect( _taskActiveTimer, TQ_SIGNAL( timeout() ), this,
+ TQ_SLOT( advanceClock()) );
if (icons == 0) {
icons = new TQPtrVector<TQPixmap>(8);
diff --git a/karm/tray.h b/karm/tray.h
index 45b3b702..1740a222 100644
--- a/karm/tray.h
+++ b/karm/tray.h
@@ -23,7 +23,7 @@ class MainWindow;
class KarmTray : public KSystemTray
{
- Q_OBJECT
+ TQ_OBJECT
public: