[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdeutils/kjots
From: Stanislav Kljuhhin <crz () starman ! ee>
Date: 2003-08-31 1:33:17
[Download RAW message or body]
CVS commit by crzcrz:
minor cleanup
M +1 -31 KJotsMain.cpp 1.114
M +0 -3 KJotsMain.h 1.42
M +0 -1 Makefile.am 1.35
R optiondialog.cpp 1.13
R optiondialog.h 1.6
--- kdeutils/kjots/KJotsMain.cpp #1.113:1.114
@@ -21,7 +21,4 @@
//
-#include <iostream>
-using namespace std;
-
#include <qbuttongroup.h>
#include <qcursor.h>
@@ -60,5 +57,4 @@ using namespace std;
#include "KJotsMain.h"
-#include "optiondialog.h"
#include "kjotsentry.h"
#include "kjotsedit.h"
@@ -79,5 +75,4 @@ extern KIconLoader* global_pix_loader;
KJotsMain::KJotsMain(const char* name)
: KMainWindow(0,name),
- mOptionDialog(0),
currentEntry(0)
{
@@ -223,5 +218,5 @@ KJotsMain::KJotsMain(const char* name)
KJotsMain::~KJotsMain()
{
- delete mOptionDialog;
+
}
@@ -434,16 +429,4 @@ void KJotsMain::updateToolbars()
void KJotsMain::configure()
{
-/*
- if( mOptionDialog == 0 )
- {
- mOptionDialog = new ConfigureDialog( topLevelWidget(), 0, false );
- if( mOptionDialog == 0 ) { return; }
- connect( mOptionDialog, SIGNAL(hidden()),this,SLOT(configureHide()));
- connect( mOptionDialog, SIGNAL(valueChanged()),
- this, SLOT(updateConfiguration()) );
- }
-
- mOptionDialog->show();
-*/
if(KAutoConfigDialog::showDialog("settings"))
return;
@@ -460,17 +443,4 @@ void KJotsMain::configure()
dialog->show();
-}
-
-void KJotsMain::configureHide()
-{
- QTimer::singleShot( 0, this, SLOT(configureDestroy()) );
-}
-
-void KJotsMain::configureDestroy()
-{
- if( mOptionDialog != 0 && mOptionDialog->isVisible() == false )
- {
- delete mOptionDialog; mOptionDialog = 0;
- }
}
--- kdeutils/kjots/KJotsMain.h #1.41:1.42
@@ -78,6 +78,4 @@ class KJotsMain : public KMainWindow
void configureToolbars();
void updateToolbars();
- void configureHide();
- void configureDestroy();
void updateConfiguration();
@@ -115,5 +113,4 @@ class KJotsMain : public KMainWindow
KJotsSubject* currentSubject();
- ConfigureDialog *mOptionDialog;
QHBoxLayout *bg_top_layout;
QButtonGroup *bg_top;
--- kdeutils/kjots/Makefile.am #1.34:1.35
@@ -7,5 +7,4 @@
kjots_SOURCES = main.cpp\
KJotsMain.cpp\
- optiondialog.cpp\
kjotsentry.cpp\
kjotsedit.cpp\
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic